Headers to support 'Y' positioning fixes for OS/2 controls

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

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index 0491f7b260bd92fc785f31b952e1701029f4588c..cb8e29c0b35b11ff8e3820065b70db4bb817780a 100644 (file)
--- a/src/os2/stattext.cpp
+++ b/src/os2/stattext.cpp
@@ -45,7 +45,7 @@ bool wxStaticText::Create(
     SetBackgroundColour(pParent->GetBackgroundColour()) ;
     SetForegroundColour(pParent->GetForegroundColour()) ;
 
-    if ( id == -1 )
+    if ( vId == -1 )
         m_windowId = (int)NewControlId();
     else
         m_windowId = vId;
@@ -80,10 +80,26 @@ bool wxStaticText::Create(
 
     wxCHECK_MSG(m_hWnd, FALSE, wxT("Failed to create static ctrl"));
 
+    wxColour                        vColour;
+
+    vColour.Set(wxString("BLACK"));
+
+    LONG                            lColor = (LONG)vColour.GetPixel();
+
+    ::WinSetPresParam( m_hWnd
+                      ,PP_FOREGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
+
     SubclassWin(m_hWnd);
     wxControl::SetFont(pParent->GetFont());
-    SetSize(nX, nY, nWidth, nHeight);
-    return FALSE;
+    SetSize( nX
+            ,nY
+            ,nWidth
+            ,nHeight
+           );
+    return TRUE;
 } // end of wxStaticText::Create
 
 wxSize wxStaticText::DoGetBestSize() const
@@ -96,7 +112,7 @@ wxSize wxStaticText::DoGetBestSize() const
     int                             nHeightLine = 0;
     wxString                        sCurLine;
 
-    for ( const wxChar *pc = sText; ; pc++ )
+    for (const wxChar *pc = sText; ; pc++)
     {
         if ( *pc == wxT('\n') || *pc == wxT('\0') )
         {
@@ -143,39 +159,39 @@ wxSize wxStaticText::DoGetBestSize() const
                  );
 } // end of wxStaticText::DoGetBestSize
 
-void wxStaticText::SetLabel(
-  const wxString&                   rsLabel
+bool wxStaticText::SetFont(
+  const wxFont&                     rFont
 )
 {
-    ::WinSetWindowText(GetHwnd(), rsLabel.c_str());
+    bool                            bRet = wxControl::SetFont(rFont);
 
     //
     // Adjust the size of the window to fit to the label unless autoresizing is
     // disabled
     //
-    if (!(GetWindowStyle() & wxST_NO_AUTORESIZE))
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
     {
         DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
     }
-    DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
-} // end of wxStaticText::SetLabel
+    return bRet;
+} // end of wxStaticText::SetFont
 
-bool wxStaticText::SetFont(
-  const wxFont&                     rFont
+void wxStaticText::SetLabel(
+  const wxString&                   rsLabel
 )
 {
-    bool                            bRet = wxControl::SetFont(rFont);
+    ::WinSetWindowText(GetHwnd(), rsLabel.c_str());
 
     //
     // Adjust the size of the window to fit to the label unless autoresizing is
     // disabled
     //
-    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+    if (!(GetWindowStyle() & wxST_NO_AUTORESIZE))
     {
         DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
     }
-    return bRet;
-} // end of wxStaticText::SetFont
+    DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
+} // end of wxStaticText::SetLabel
 
 MRESULT wxStaticText::OS2WindowProc(
   WXUINT                            uMsg