concentrating content and structure region calculations

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

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index 16a28e6c60194eb9be24a1d9bb644c1fb2ae3fc1..a30d967d5945fcb6bb5c91d96b6a20075d488403 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;
     }


@@ -61,6 +59,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"));


@@ -72,7 +75,14 @@ bool wxStaticBox::Create(
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );

-    SetFont(pParent->GetFont());
+    lColor = (LONG)m_backgroundColour.GetPixel();
+
+    ::WinSetPresParam( m_hWnd
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
+    SetFont(*wxSMALL_FONT);

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