added wxShutdown (patch 547443)

[wxWidgets.git] / src / mac / dialog.cpp

diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index 8a066964ca05483659bf1da95be611489b782a0a..d0bb7b2adcbacfaa93764bfaf546cca42bc49fb6 100644 (file)
--- a/src/mac/dialog.cpp
+++ b/src/mac/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) )
@@ -67,6 +67,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
        MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style)  , name ) ;
 
        m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
+       SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
   return TRUE;
 }
 
@@ -268,7 +269,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+  SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
   Refresh();
 }