use const for xpm icons

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index f0b0ca6eee2eae1b2e2803c19d545b6d98fa2bf8..2a127e76319c5a884278d7f9461894cb98fb2573 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -29,17 +29,6 @@ wxList wxModalDialogs;
 
 IMPLEMENT_DYNAMIC_CLASS(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)
-
-  EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
-
-  EVT_CLOSE(wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-
 void wxDialog::Init()
 {
     m_isModalStyle = false;
@@ -117,11 +106,6 @@ bool wxDialog::IsModal() const
 }
 
 
-bool wxDialog::IsModalShowing() const
-{
-    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
-}
-
 bool wxDialog::Show(bool show)
 {
     if ( !wxDialogBase::Show(show) )
@@ -155,7 +139,7 @@ extern bool s_macIsInModalLoop ;
 
 void wxDialog::DoShowModal()
 {
-    wxCHECK_RET( !IsModalShowing(), wxT("DoShowModal() called twice") );
+    wxCHECK_RET( !IsModal(), wxT("DoShowModal() called twice") );
 
     wxModalDialogs.Append(this);
 
@@ -169,7 +153,7 @@ void wxDialog::DoShowModal()
     s_macIsInModalLoop = true ;
 #endif
 
-    while ( IsModalShowing() )
+    while ( IsModal() )
     {
         wxTheApp->MacDoOneEvent() ;
         // calls process idle itself