SWIGged updates for wxMSW

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

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index cb8e29c0b35b11ff8e3820065b70db4bb817780a..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"


@@ -91,14 +92,27 @@ bool wxStaticText::Create(
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );

+    lColor = (LONG)m_backgroundColour.GetPixel();
+
+    ::WinSetPresParam( m_hWnd
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );

 
     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
 


@@ -159,6 +173,27 @@ wxSize wxStaticText::DoGetBestSize() const
                  );
 } // end of wxStaticText::DoGetBestSize
 
                  );
 } // end of wxStaticText::DoGetBestSize
 

+void wxStaticText::DoSetSize(
+  int                               nX
+, int                               nY
+, int                               nWidth
+, int                               nHeight
+, int                               nSizeFlags
+)
+{
+    //
+    // We need to refresh the window after changing its size as the standard
+    // control doesn't always update itself properly.
+    //
+    wxStaticTextBase::DoSetSize( nX
+                                ,nY
+                                ,nWidth
+                                ,nHeight
+                                ,nSizeFlags
+                               );
+    Refresh();
+} // end of wxStaticText::DoSetSize
+

 bool wxStaticText::SetFont(
   const wxFont&                     rFont
 )
 bool wxStaticText::SetFont(
   const wxFont&                     rFont
 )


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

-
-