diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index e310808ff8..2b6a3bb7b7 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -68,8 +68,8 @@ set(SLIC3R_GUI_SOURCES GUI/Widgets/SideTools.hpp GUI/Widgets/WebView.cpp GUI/Widgets/WebView.hpp - GUI/Widgets/wxStaticText2.cpp - GUI/Widgets/wxStaticText2.hpp + GUI/Widgets/ErrorMsgStaticText.cpp + GUI/Widgets/ErrorMsgStaticText.hpp GUI/AboutDialog.cpp GUI/AboutDialog.hpp GUI/NetworkTestDialog.cpp diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index a7f4dd82bb..4f6db5f70e 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -517,7 +517,7 @@ wxBoxSizer *StatusBasePanel::create_project_task_page(wxWindow *parent) wxBoxSizer *static_text_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *text_sizer = new wxBoxSizer(wxHORIZONTAL); - m_error_text = new wxStaticText2(m_panel_error_txt); + m_error_text = new ErrorMsgStaticText(m_panel_error_txt); m_error_text->SetForegroundColour(wxColour(255, 0, 0)); text_sizer->Add(m_error_text, 1, wxEXPAND|wxLEFT, FromDIP(17)); @@ -535,9 +535,9 @@ wxBoxSizer *StatusBasePanel::create_project_task_page(wxWindow *parent) m_button_clean->SetFont(Label::Body_10); m_button_clean->SetMinSize(TASK_BUTTON_SIZE2); - static_text_sizer->Add(text_sizer, 1, wxEXPAND|wxTOP, FromDIP(7)); + static_text_sizer->Add(text_sizer, 1, wxEXPAND, 0); static_text_sizer->Add( FromDIP(10), 0, 0, 0, 0 ); - static_text_sizer->Add(m_button_clean, 0, wxALIGN_CENTRE_VERTICAL|wxRIGHT,FromDIP(5)); + static_text_sizer->Add(m_button_clean, 0, wxALIGN_CENTRE_VERTICAL|wxRIGHT, FromDIP(5)); m_panel_error_txt->SetSizer(static_text_sizer); m_panel_error_txt->Hide(); diff --git a/src/slic3r/GUI/StatusPanel.hpp b/src/slic3r/GUI/StatusPanel.hpp index 4d95d1c9a4..23f53915ef 100644 --- a/src/slic3r/GUI/StatusPanel.hpp +++ b/src/slic3r/GUI/StatusPanel.hpp @@ -28,7 +28,7 @@ #include "Widgets/ImageSwitchButton.hpp" #include "Widgets/AMSControl.hpp" #include "HMS.hpp" -#include "Widgets/wxStaticText2.hpp" +#include "Widgets/ErrorMsgStaticText.hpp" class StepIndicator; #define COMMAND_TIMEOUT_U0 15 @@ -177,7 +177,7 @@ protected: wxBoxSizer * m_tasklist_caption_sizer; wxPanel* m_panel_error_txt; wxPanel* m_staticline; - wxStaticText2 * m_error_text; + ErrorMsgStaticText * m_error_text; wxStaticText* m_staticText_calibration_caption; wxStaticText* m_staticText_calibration_caption_top; wxStaticText* m_calibration_text; diff --git a/src/slic3r/GUI/Widgets/wxStaticText2.cpp b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp similarity index 83% rename from src/slic3r/GUI/Widgets/wxStaticText2.cpp rename to src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp index 79bce893c5..cdcbf489c1 100644 --- a/src/slic3r/GUI/Widgets/wxStaticText2.cpp +++ b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp @@ -1,17 +1,17 @@ -#include "wxStaticText2.hpp" +#include "ErrorMsgStaticText.hpp" -wxStaticText2::wxStaticText2() {} +ErrorMsgStaticText::ErrorMsgStaticText() {} -wxStaticText2::wxStaticText2(wxWindow * parent, +ErrorMsgStaticText::ErrorMsgStaticText(wxWindow * parent, wxWindowID id, const wxPoint & pos, const wxSize & size) { Create(parent, id, pos, size); - Bind(wxEVT_PAINT, &wxStaticText2::paintEvent, this); + Bind(wxEVT_PAINT, &ErrorMsgStaticText::paintEvent, this); } -void wxStaticText2::paintEvent(wxPaintEvent &evt) +void ErrorMsgStaticText::paintEvent(wxPaintEvent &evt) { auto size = GetSize(); wxPaintDC dc(this); diff --git a/src/slic3r/GUI/Widgets/wxStaticText2.hpp b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp similarity index 50% rename from src/slic3r/GUI/Widgets/wxStaticText2.hpp rename to src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp index ce5220377d..6a455b208b 100644 --- a/src/slic3r/GUI/Widgets/wxStaticText2.hpp +++ b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp @@ -1,18 +1,18 @@ -#ifndef _WX_STATTEXT2_H_ -#define _WX_STATTEXT2_H_ +#ifndef _WX_ERRORMSGSTATTEXT_H_ +#define _WX_ERRORMSGSTATTEXT_H_ #include "wx/stattext.h" -class WXDLLIMPEXP_CORE wxStaticText2 : public wxPanel +class WXDLLIMPEXP_CORE ErrorMsgStaticText : public wxPanel { public: wxString m_msg; - wxStaticText2(); - wxStaticText2(wxWindow *parent, + ErrorMsgStaticText(); + ErrorMsgStaticText(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxSize(200,200)); + const wxSize& size = wxSize(0,0)); void paintEvent(wxPaintEvent &evt);