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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index aff9a05e68..cd21abe857 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -36,9 +36,17 @@
 #endif
 
 #include "wx/statbox.h"
+#include "wx/notebook.h"
+#include "wx/sysopt.h"
 
 #include "wx/msw/private.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
 // ----------------------------------------------------------------------------
@@ -114,32 +122,22 @@ bool wxStaticBox::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return false;
 
-    // as wxStaticBox doesn't draw its own background, we make it transparent
-    // to force redrawing its background which could have been overwritten by
-    // the other controls inside it
-    //
-    // FIXME: I still think that it isn't the right solution because the static
-    //        boxes shouldn't have to be transparent if the redrawing was done
-    //        right elsewhere - who ever had to make them transparent in non
-    //        wxWidgets programs, after all? But for now it does fix a serious
-    //        problem (try resizing the sizers test screen in the layout sample
-    //        after removing WS_EX_TRANSPARENT bit) and so let's use it until
-    //        we fix the real underlying problem
-    if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, label,
-#ifdef __WXWINCE__
-        0
-#else
-        WS_EX_TRANSPARENT
-#endif
-                           ) )
+    if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) )
         return false;
 
-    // to be transparent we should have the same colour as the parent as well
-    SetBackgroundColour(GetParent()->GetBackgroundColour());
-
     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;
@@ -156,36 +154,45 @@ wxSize wxStaticBox::DoGetBestSize() const
 
 WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
-    switch ( nMsg )
-    {
 #ifndef __WXWINCE__
-        case WM_NCHITTEST:
-            // FIXME: this hack is specific to dialog ed, shouldn't it be
-            //        somehow disabled during normal operation?
-            {
-                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;
-            }
-            break;
-#endif
-        case WM_ERASEBKGND:
-            // prevent wxControl from processing this message because it will
-            // erase the background incorrectly and there is no way for us to
-            // override this at wxWin event level (if we do process the event,
-            // we don't know how to do it properly - paint the background
-            // without painting over other controls - and if we don't,
-            // wxControl still gets it)
-            return MSWDefWindowProc(nMsg, wParam, lParam);
+    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
+