Code cleaning.

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

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index 61f5db74d6cf964bb3d8488d21d466b94a39f386..2464ee04b0ca65132b865fdeacce365a13c1b0bc 100644 (file)
--- a/src/os2/statbox.cpp
+++ b/src/os2/statbox.cpp
@@ -34,16 +34,14 @@ bool wxStaticBox::Create(
 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

-    if(!OS2CreateControl( pParent
-                         ,vId
-                         ,rPos
-                         ,rSize
-                         ,lStyle
-#if wxUSE_VALIDATORS
-                         ,wxDefaultValidator
-#endif
-                         ,rsName
-                        ))
+    if(!CreateControl( pParent
+                      ,vId
+                      ,rPos
+                      ,rSize
+                      ,lStyle
+                      ,wxDefaultValidator
+                      ,rsName
+                     ))

     {
         return FALSE;
     }
     {
         return FALSE;
     }


@@ -51,7 +49,7 @@ bool wxStaticBox::Create(
     wxPoint                         vPos(0,0);
     wxSize                          vSize(0,0);
 
     wxPoint                         vPos(0,0);
     wxSize                          vSize(0,0);
 

-    if (!OS2CreateControl( "STATIC"
+    if (!OS2CreateControl( wxT("STATIC")

                           ,SS_GROUPBOX
                           ,vPos
                           ,vSize
                           ,SS_GROUPBOX
                           ,vPos
                           ,vSize


@@ -61,36 +59,31 @@ bool wxStaticBox::Create(
         return FALSE;
     }
 
         return FALSE;
     }
 

-    wxColour                        vColour;
-
-    vColour.Set(wxString("BLACK"));
+    //
+    // To be transparent we should have the same colour as the parent as well
+    //
+    SetBackgroundColour(GetParent()->GetBackgroundColour());

 
 

+    wxColour                        vColour;
+    vColour.Set(wxString(wxT("BLACK")));

     LONG                            lColor = (LONG)vColour.GetPixel();
     LONG                            lColor = (LONG)vColour.GetPixel();

-

     ::WinSetPresParam( m_hWnd
                       ,PP_FOREGROUNDCOLOR
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
     ::WinSetPresParam( m_hWnd
                       ,PP_FOREGROUNDCOLOR
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );

-    lColor = (LONG)m_backgroundColour.GetPixel();

 
 

+    lColor = (LONG)m_backgroundColour.GetPixel();

     ::WinSetPresParam( m_hWnd
                       ,PP_BACKGROUNDCOLOR
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
     ::WinSetPresParam( m_hWnd
                       ,PP_BACKGROUNDCOLOR
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );

-    wxFont*                          pTextFont = new wxFont( 10
-                                                            ,wxMODERN
-                                                            ,wxNORMAL
-                                                            ,wxNORMAL
-                                                           );
-    SetFont(*pTextFont);

     SetSize( rPos.x
             ,rPos.y
             ,rSize.x
             ,rSize.y
            );
     SetSize( rPos.x
             ,rPos.y
             ,rSize.x
             ,rSize.y
            );

-    delete pTextFont;

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


@@ -100,14 +93,11 @@ wxSize wxStaticBox::DoGetBestSize() const
     int                             nCy;
     int                             wBox;
 
     int                             nCy;
     int                             wBox;
 

-    wxGetCharSize( GetHWND()
-                  ,&nCx
-                  ,&nCy
-                  ,(wxFont*)&GetFont()
-                 );
+    nCx = GetCharWidth();
+    nCy = GetCharHeight();

     GetTextExtent( wxGetWindowText(m_hWnd)
                   ,&wBox
     GetTextExtent( wxGetWindowText(m_hWnd)
                   ,&wBox

-                  ,&nCy
+                  ,NULL

                  );
     wBox += 3 * nCx;
 
                  );
     wBox += 3 * nCx;