A few tweaks and cleanups

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

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index 792a6fd3042297cc472d9e3dc57816703eaebaaa..571107c39b62da91c86177053e0ba1b5bd048d49 100644 (file)
--- a/src/os2/statbox.cpp
+++ b/src/os2/statbox.cpp
@@ -34,16 +34,16 @@ bool wxStaticBox::Create(
 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

-    if(!OS2CreateControl( pParent
-                         ,vId
-                         ,rPos
-                         ,rSize
-                         ,lStyle
+    if(!CreateControl( pParent
+                      ,vId
+                      ,rPos
+                      ,rSize
+                      ,lStyle

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

-                         ,wxDefaultValidator
+                      ,wxDefaultValidator

 #endif
 #endif

-                         ,rsName
-                        ))
+                      ,rsName
+                     ))

     {
         return FALSE;
     }
     {
         return FALSE;
     }


@@ -61,6 +61,11 @@ bool wxStaticBox::Create(
         return FALSE;
     }
 
         return FALSE;
     }
 

+    //
+    // To be transparent we should have the same colour as the parent as well
+    //
+    SetBackgroundColour(GetParent()->GetBackgroundColour());
+

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


@@ -79,12 +84,18 @@ bool wxStaticBox::Create(
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );

-    SetFont(pParent->GetFont());
+    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