check for NULL pointer in OnMeasureItem() as well as in OnDrawItem()

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

diff --git a/src/mac/classic/dialog.cpp b/src/mac/classic/dialog.cpp
index f29ed3e59eab4d46b446f9f16aa155c56b24c0e4..6c9646751c84777aabcf33e350aaec93104f3b45 100644 (file)
--- a/src/mac/classic/dialog.cpp
+++ b/src/mac/classic/dialog.cpp
@@ -44,9 +44,9 @@ END_EVENT_TABLE()
 
 #endif
 
-wxDialog::wxDialog()
+void wxDialog::Init()
 {
-      m_isShown = FALSE;
+    m_isModalStyle = false;
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 }
 
@@ -75,7 +75,7 @@ void wxDialog::SetModal(bool flag)
 {
     if ( flag )
     {
-        m_windowStyle |= wxDIALOG_MODAL;
+        m_isModalStyle = true;
 
         wxModelessWindows.DeleteObject(this);
 #if TARGET_CARBON
@@ -84,7 +84,7 @@ void wxDialog::SetModal(bool flag)
     }
     else
     {
-        m_windowStyle &= ~wxDIALOG_MODAL;
+        m_isModalStyle = false;
 
         wxModelessWindows.Append(this);
     }
@@ -117,7 +117,7 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
 
 bool wxDialog::IsModal() const
 {
-    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+    return m_isModalStyle;
 }