wxUSE_TOOLTIPS and wxUSE_IMAGE furthur fixes

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index eede3a9705d8a0b4154d835177a994050eff76c2..d7881bc2ff4717d69554151af0ccf3835f31a3dc 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -37,6 +37,7 @@
 
 #include "wx/statbox.h"
 #include "wx/notebook.h"
+#include "wx/sysopt.h"
 
 #include "wx/msw/private.h"
 
@@ -151,4 +152,38 @@ wxSize wxStaticBox::DoGetBestSize() const
     return wxSize(wBox, hBox);
 }
 
+WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+    switch ( nMsg )
+    {
+#ifndef __WXWINCE__
+        case 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;
+                }
+            }
+            break;
+#endif
+    }
+
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+}
+
 #endif // wxUSE_STATBOX
+