Do not emit a wxEVT_COMMAND_TEXT_UPDATED when the tab key is lifted (otherwise each...

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

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index 61f5db74d6cf964bb3d8488d21d466b94a39f386..470c2380e974811690985ddf832d1f39fad443af 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"));


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

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

     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
 


@@ -99,11 +96,12 @@ wxSize wxStaticBox::DoGetBestSize() const
     int                             nCx;
     int                             nCy;
     int                             wBox;
     int                             nCx;
     int                             nCy;
     int                             wBox;

+    wxFont                          vFont = GetFont();

 
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy
 
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy

-                  ,(wxFont*)&GetFont()
+                  ,&vFont

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