determine the slider event type more precisely (i.e. generate LINE/PAGE UP/DOWN and...

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

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index 792a6fd3042297cc472d9e3dc57816703eaebaaa..ef75d915d0bb40d757e8fb5f5efbceeb5928a766 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,9 +59,14 @@ 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;
 
     wxColour                        vColour;
 

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

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


@@ -79,7 +82,7 @@ bool wxStaticBox::Create(
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );

-    SetFont(pParent->GetFont());
+    SetFont(*wxSMALL_FONT);

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


@@ -94,14 +97,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;