X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4159f685e27805a55af8164bdbaf5b396aae84ca..4e89ceb11ee28f55050dfc03c69e72cd84f98cdf:/src/mac/carbon/dialog.cpp?ds=sidebyside diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp index 8a066964ca..755ad0192a 100644 --- a/src/mac/carbon/dialog.cpp +++ b/src/mac/carbon/dialog.cpp @@ -30,7 +30,7 @@ extern wxList wxPendingDelete; #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) -BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow) +BEGIN_EVENT_TABLE(wxDialog, wxDialogBase) EVT_BUTTON(wxID_OK, wxDialog::OnOK) EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) @@ -47,7 +47,7 @@ END_EVENT_TABLE() wxDialog::wxDialog() { m_isShown = FALSE; - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); } bool wxDialog::Create(wxWindow *parent, wxWindowID id, @@ -58,7 +58,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, const wxString& name) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) @@ -268,7 +268,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event) void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); Refresh(); }