don't try to save invalid image: added a wxCHECK(Ok()) to Save() overloads which...

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 4173fcfee65cf00e76f34dcc66a408c7be9ab7da..d7881bc2ff4717d69554151af0ccf3835f31a3dc 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -36,9 +36,16 @@
 #endif
 
 #include "wx/statbox.h"
 #endif
 
 #include "wx/statbox.h"

+#include "wx/notebook.h"
+#include "wx/sysopt.h"

 
 #include "wx/msw/private.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
 
 // ----------------------------------------------------------------------------
 // wxWin macros


@@ -115,12 +122,22 @@ bool wxStaticBox::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return false;
 
     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;
 }
 
         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;
 wxSize wxStaticBox::DoGetBestSize() const
 {
     int cx, cy;


@@ -135,18 +152,38 @@ wxSize wxStaticBox::DoGetBestSize() const
     return wxSize(wBox, hBox);
 }
 
     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);
+    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
 }
 
 #endif // wxUSE_STATBOX

+