moved styles logic to MSWGetStyle() (no real changes)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 4109ac7a1920cc3a8ab7fb8e5249c0addfe0e174..ec93e0c97af52379fdafd488b71a2091c01798a3 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_STATBOX_H_
-#define _WX_STATBOX_H_
+#ifndef _WX_MSW_STATBOX_H_
+#define _WX_MSW_STATBOX_H_
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "statbox.h"
@@ -42,11 +42,12 @@ public:
 protected:
     virtual wxSize DoGetBestSize() const;
 
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
     virtual WXHBRUSH MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC);
 
-private:
+
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
 };
 
-#endif
-    // _WX_STATBOX_H_
+#endif // _WX_MSW_STATBOX_H_
+

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 6cd10ee393be23c3c66bcb0b98d45a6b607d00bd..606b929536e2cdeb6b3866e8b5871ebe14c7adb5 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -40,7 +40,8 @@
 
 #include "wx/msw/private.h"
 
-// this is for Win CE
+// under CE this style is not defined but we don't need to make static boxes
+// transparent there neither
 #ifndef WS_EX_TRANSPARENT
     #define WS_EX_TRANSPARENT 0
 #endif
@@ -120,13 +121,22 @@ bool wxStaticBox::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return false;
 
-    if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, label,
-                           WS_EX_TRANSPARENT) )
+    if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) )
         return false;
 
     return true;
 }
 
+WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);
+
+    if ( exstyle )
+        *exstyle = WS_EX_TRANSPARENT;
+
+    return styleWin | BS_GROUPBOX;
+}
+
 wxSize wxStaticBox::DoGetBestSize() const
 {
     int cx, cy;