Build fix after wxColourBase introduction.

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

diff --git a/src/mac/classic/dialog.cpp b/src/mac/classic/dialog.cpp
index f29ed3e59eab4d46b446f9f16aa155c56b24c0e4..4de3a891db281172100b84751b973799d9bc761f 100644 (file)
--- a/src/mac/classic/dialog.cpp
+++ b/src/mac/classic/dialog.cpp
@@ -9,10 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "dialog.h"
-#endif
-
 #include "wx/dialog.h"
 #include "wx/utils.h"
 #include "wx/frame.h"
@@ -27,7 +23,6 @@ wxList wxModalDialogs;
 //wxList wxModelessWindows;  // Frames and modeless dialogs
 extern wxList wxPendingDelete;
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
@@ -42,11 +37,9 @@ BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
   EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
-#endif
-
-wxDialog::wxDialog()
+void wxDialog::Init()
 {
-      m_isShown = FALSE;
+    m_isModalStyle = false;
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 }
 
@@ -75,7 +68,7 @@ void wxDialog::SetModal(bool flag)
 {
     if ( flag )
     {
-        m_windowStyle |= wxDIALOG_MODAL;
+        m_isModalStyle = true;
 
         wxModelessWindows.DeleteObject(this);
 #if TARGET_CARBON
@@ -84,7 +77,7 @@ void wxDialog::SetModal(bool flag)
     }
     else
     {
-        m_windowStyle &= ~wxDIALOG_MODAL;
+        m_isModalStyle = false;
 
         wxModelessWindows.Append(this);
     }
@@ -117,7 +110,7 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
 
 bool wxDialog::IsModal() const
 {
-    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+    return m_isModalStyle;
 }