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

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

diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp
index e09644b5b1224381b99eb631c7168ffbc2475d9a..2f2a955f836aa7b9f4a8ea44caf3e507ef71479f 100644 (file)
--- a/src/univ/stattext.cpp
+++ b/src/univ/stattext.cpp
@@ -6,7 +6,7 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "univstattext.h"
 #endif
 
@@ -59,8 +59,6 @@ bool wxStaticText::Create(wxWindow *parent,
     if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
         
-    m_hasDialogBackground = TRUE;
-
     SetLabel(label);
     SetBestSize(size);