Don't do the wx cleanup if wxPython didn't do the initialization.

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

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index fbeefc707fe1a3ab8f959c3dd274c5ee962b49ec..56e44dca0e4fe5039ab1dcb331cfe12a8586a940 100644 (file)
--- a/src/os2/stattext.cpp
+++ b/src/os2/stattext.cpp
@@ -20,6 +20,7 @@
 #include "wx/event.h"
 #include "wx/app.h"
 #include "wx/brush.h"
 #include "wx/event.h"
 #include "wx/app.h"
 #include "wx/brush.h"

+#include "wx/scrolwin.h"

 #endif
 
 #include "wx/stattext.h"
 #endif
 
 #include "wx/stattext.h"


@@ -100,12 +101,18 @@ bool wxStaticText::Create(
                      );
 
     SubclassWin(m_hWnd);
                      );
 
     SubclassWin(m_hWnd);

-    wxControl::SetFont(pParent->GetFont());
+    wxFont*                          pTextFont = new wxFont( 10
+                                                            ,wxMODERN
+                                                            ,wxNORMAL
+                                                            ,wxNORMAL
+                                                           );
+    wxControl::SetFont(*pTextFont);

     SetSize( nX
             ,nY
             ,nWidth
             ,nHeight
            );
     SetSize( nX
             ,nY
             ,nWidth
             ,nHeight
            );

+    delete pTextFont;

     return TRUE;
 } // end of wxStaticText::Create
 
     return TRUE;
 } // end of wxStaticText::Create
 


@@ -232,5 +239,3 @@ MRESULT wxStaticText::OS2WindowProc(
                                    ,lParam
                                   );
 } // end of wxStaticText::OS2WindowProc
                                    ,lParam
                                   );
 } // end of wxStaticText::OS2WindowProc

-
-