Added files for wxNotebook and wxCocoaNSTabView

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

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index 0f5bd5600093f5638e9a675c585fbad4b3609cee..40b3f7efe83c2f8d523280766afa68d3a4735513 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -14,7 +14,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univdialog.h"
 #endif
 
     #pragma implementation "univdialog.h"
 #endif
 


@@ -166,11 +166,6 @@ bool wxDialog::IsModal() const
     return m_isShowingModal;
 }
 
     return m_isShowingModal;
 }
 

-void wxDialog::SetModal(bool WXUNUSED(flag))
-{
-    wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
-}
-

 int wxDialog::ShowModal()
 {
     if ( IsModal() )
 int wxDialog::ShowModal()
 {
     if ( IsModal() )


@@ -190,14 +185,17 @@ int wxDialog::ShowModal()
         }
     }
 
         }
     }
 

-    wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
-

     Show(TRUE);
 
     m_isShowingModal = TRUE;
 
     wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
 
     Show(TRUE);
 
     m_isShowingModal = TRUE;
 
     wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
 

+#if defined(__WXGTK__) || defined(__WXMGL__)
+    wxBusyCursorSuspender suspender;
+    // FIXME (FIXME_MGL) - make sure busy cursor disappears under MSW too
+#endif
+

     m_windowDisabler = new wxWindowDisabler(this);
     if ( !m_eventLoop )
         m_eventLoop = new wxEventLoop;
     m_windowDisabler = new wxWindowDisabler(this);
     if ( !m_eventLoop )
         m_eventLoop = new wxEventLoop;