diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index b45f27b667..36ffb30597 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -17,7 +17,6 @@ set( COMMON_ABOUT_DLG_SRCS dialogs/dialog_get_component_base.cpp dialogs/dialog_hotkeys_editor.cpp dialogs/dialog_hotkeys_editor_base.cpp - dialogs/dialog_load_error.cpp dialogs/dialog_page_settings_base.cpp ) @@ -58,6 +57,7 @@ set(COMMON_SRCS gr_basic.cpp hotkeys_basic.cpp hotkey_grid_table.cpp + html_messagebox.cpp msgpanel.cpp netlist_keywords.cpp newstroke_font.cpp diff --git a/common/dialogs/dialog_load_error.cpp b/common/html_messagebox.cpp similarity index 63% rename from common/dialogs/dialog_load_error.cpp rename to common/html_messagebox.cpp index f833431770..cf41c0c35c 100644 --- a/common/dialogs/dialog_load_error.cpp +++ b/common/html_messagebox.cpp @@ -1,22 +1,22 @@ #include "fctsys.h" -#include "dialog_load_error.h" +#include "html_messagebox.h" #include "macros.h" -DIALOG_LOAD_ERROR::DIALOG_LOAD_ERROR( wxWindow* parent ) -: -DIALOG_DISPLAY_HTML_TEXT_BASE( parent, wxID_ANY, _("Load Error!"),wxDefaultPosition, wxSize( 450,250 ) ) +HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* parent, const wxString & aTitle, + wxPoint aPos, wxSize aSize) + : DIALOG_DISPLAY_HTML_TEXT_BASE( parent, wxID_ANY, aTitle, aPos, aSize ) { SetFocus(); ListClear(); } -void DIALOG_LOAD_ERROR::OnCloseButtonClick( wxCommandEvent& event ) +void HTML_MESSAGE_BOX::OnCloseButtonClick( wxCommandEvent& event ) { EndModal(0); } -void DIALOG_LOAD_ERROR::ListClear(void) +void HTML_MESSAGE_BOX::ListClear(void) { m_htmlWindow->SetPage(wxEmptyString); } @@ -26,7 +26,7 @@ void DIALOG_LOAD_ERROR::ListClear(void) * Add a list of items. * @param aList = a string containing items. Items are separated by '\n' */ -void DIALOG_LOAD_ERROR::ListSet(const wxString &aList) +void HTML_MESSAGE_BOX::ListSet(const wxString &aList) { wxArrayString* wxStringSplit( wxString txt, wxChar splitter ); @@ -48,7 +48,7 @@ void DIALOG_LOAD_ERROR::ListSet(const wxString &aList) * Add a list of items. * @param aList = a wxArrayString containing items */ -void DIALOG_LOAD_ERROR::ListSet(const wxArrayString &aList) +void HTML_MESSAGE_BOX::ListSet(const wxArrayString &aList) { wxString msg = wxT("