X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21f4383ae7aa404e3d4ddb8f67d2705c54338e44..7848088476db284a94f19eeb24411b45d676ac46:/src/univ/dialog.cpp

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index dfb4a5b279..40b3f7efe8 100644
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -6,14 +6,32 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "univdialog.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "univdialog.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/dialog.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/dialog.h"
-#include "wx/utils.h"
 #include "wx/evtloop.h"
-#include "wx/app.h"
 
 //-----------------------------------------------------------------------------
 // wxDialog
@@ -148,11 +166,6 @@ bool wxDialog::IsModal() const
     return m_isShowingModal;
 }
 
-void wxDialog::SetModal(bool WXUNUSED(flag))
-{
-    wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
-}
-
 int wxDialog::ShowModal()
 {
     if ( IsModal() )
@@ -172,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?") );
 
+#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;