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 cf1d19793b044fddfcdcb01debd13092609ae960..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
 
@@ -153,18 +153,6 @@ bool wxDialog::Show(bool show)
             EndModal(wxID_CANCEL);
     }
 
-    // Not sure how to put this in platform-specific
-    // code just yet. Nano-X has to force a size event,
-    // else there's no initial size.
-#if wxUSE_NANOX
-    if (show)
-    {
-        wxSizeEvent event(GetSize(), GetId());
-        event.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(event);
-    }
-#endif
-
     bool ret = wxDialogBase::Show(show);
 
     if ( show ) 
@@ -178,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() )