Implement wxIcon::LoadFile by defering to wxBitmap implementation instead of creating...

[wxWidgets.git] / src / common / dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 8430081563dd78102287bc3ce7bb9f90f03f240f..5621cbc6a978991b91aa58ef451a9829a013d54d 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -52,12 +52,8 @@ BEGIN_EVENT_TABLE(wxDialogBase, wxTopLevelWindow)
     EVT_CLOSE(wxDialogBase::OnCloseWindow)
 
     EVT_CHAR_HOOK(wxDialogBase::OnCharHook)
-
-    WX_EVENT_TABLE_CONTROL_CONTAINER(wxDialogBase)
 END_EVENT_TABLE()
 
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase, wxTopLevelWindow)
-
 void wxDialogBase::Init()
 {
     m_returnCode = 0;
@@ -68,8 +64,6 @@ void wxDialogBase::Init()
     // dialog controls from reaching the parent frame which is usually
     // undesirable and can lead to unexpected and hard to find bugs
     SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS);
-
-    WX_INIT_CONTROL_CONTAINER();
 }
 
 // helper of GetParentForModalDialog()
@@ -80,7 +74,7 @@ static bool CanBeUsedAsParent(wxWindow *parent)
     return !parent->HasExtraStyle(wxWS_EX_TRANSIENT) &&
                 parent->IsShownOnScreen() &&
                     !wxPendingDelete.Member(parent) &&
-                        parent->IsBeingDeleted();
+                        !parent->IsBeingDeleted();
 }
 
 wxWindow *wxDialogBase::GetParentForModalDialog(wxWindow *parent) const
@@ -198,7 +192,9 @@ wxSizer *wxDialogBase::CreateButtonSizer(long flags)
     {
         sizer = CreateStdDialogButtonSizer(flags);
     }
-#endif // wxUSE_BUTTON
+#else // !wxUSE_BUTTON
+    wxUnusedVar(flags);
+#endif // wxUSE_BUTTON/!wxUSE_BUTTON
 
 #endif // __SMARTPHONE__/!__SMARTPHONE__
 
@@ -454,8 +450,12 @@ void wxDialogBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
     closing.DeleteObject(this);
 }
 
-void wxDialogBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
+void wxDialogBase::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
-  SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-  Refresh();
+#ifndef __WXGTK__
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    Refresh();
+#endif
+
+    event.Skip();
 }