X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b04093c949b167780465008be80b273b25c28e3a..f0e5a44df103e880f57416f483e8f3f4b4bc9651:/src/msw/statbox.cpp

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 4173fcfee6..cd21abe857 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -36,9 +36,16 @@
 #endif
 
 #include "wx/statbox.h"
+#include "wx/notebook.h"
+#include "wx/sysopt.h"
 
 #include "wx/msw/private.h"
-#include "wx/msw/notebook.h"
+
+// 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
 
 // ----------------------------------------------------------------------------
 // wxWin macros
@@ -115,12 +122,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, 0) )
+    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;
@@ -135,18 +152,47 @@ wxSize wxStaticBox::DoGetBestSize() const
     return wxSize(wBox, hBox);
 }
 
-WXHBRUSH
-wxStaticBox::MSWGetBgBrushForSelf(wxWindow *parent, WXHDC WXUNUSED(pDC))
+WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
-    // we can't use pattern brushes because, apparently, the window proc of our
-    // class does something which invalidates the brush origin before drawing
-    // with it and so any patetrn brush is used incorrectly as can be seen by
-    // putting a static box inside a (themed) notebook
-    //
-    // so always use solid brush for painting the background (note that this
-    // only applies to the background of the box label, not the insides of the
-    // box itself)
-    return parent->MSWGetSolidBgBrushForChild(this);
+#ifndef __WXWINCE__
+    if ( nMsg == WM_NCHITTEST )
+    {
+        // This code breaks some other processing such as enter/leave tracking
+        // so it's off by default.
+
+        static int s_useHTClient = -1;
+        if (s_useHTClient == -1)
+            s_useHTClient = wxSystemOptions::GetOptionInt(wxT("msw.staticbox.htclient"));
+        if (s_useHTClient == 1)
+        {
+            int xPos = LOWORD(lParam);  // horizontal position of cursor
+            int yPos = HIWORD(lParam);  // vertical position of cursor
+
+            ScreenToClient(&xPos, &yPos);
+
+            // Make sure you can drag by the top of the groupbox, but let
+            // other (enclosed) controls get mouse events also
+            if ( yPos < 10 )
+                return (long)HTCLIENT;
+        }
+    }
+#endif // !__WXWINCE__
+
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+}
+
+void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
+{
+    wxStaticBoxBase::GetBordersForSizer(borderTop, borderOther);
+
+    // if not using correct (but backwards cojmpatible) text metrics
+    // calculations, we need to add some extra margin or otherwise static box
+    // title is clipped
+#if !wxDIALOG_UNIT_COMPATIBILITY
+    if ( !GetLabel().empty() )
+        *borderTop += GetCharHeight()/3;
+#endif // !wxDIALOG_UNIT_COMPATIBILITY
 }
 
 #endif // wxUSE_STATBOX
+