use GetFont() instead of (possibly not initialized) m_font in GetCharWidth/Height()

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

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index 4116e83c3db8b6173b73042523f12cc196e61bef..40b3f7efe83c2f8d523280766afa68d3a4735513 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -14,7 +14,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "univdialog.h"
 #endif
 
@@ -166,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() )
@@ -196,9 +191,9 @@ int wxDialog::ShowModal()
 
     wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
 
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMGL__)
     wxBusyCursorSuspender suspender;
-    // FIXME - make sure busy cursor disappears under MSW too
+    // FIXME (FIXME_MGL) - make sure busy cursor disappears under MSW too
 #endif
 
     m_windowDisabler = new wxWindowDisabler(this);