Applied dir control token patch.

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 2a622955cb2705d1cd653863c9cd8cd860f20198..cd21abe8574c29f199dd56bb27ff15099ccede8a 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -36,9 +36,17 @@
 #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"
 

+// 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
 // ----------------------------------------------------------------------------


@@ -55,7 +63,7 @@ wxBEGIN_FLAGS( wxStaticBoxStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)

-    
+

     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)


@@ -79,18 +87,18 @@ wxEND_FLAGS( wxStaticBoxStyle )
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl,"wx/statbox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxStaticBox)
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl,"wx/statbox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxStaticBox)

-       wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxStaticBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxStaticBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style

 /*
 /*

-       TODO PROPERTIES :
-               label
+    TODO PROPERTIES :
+        label

 */
 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxStaticBox)
 wxEND_HANDLERS_TABLE()
 
 */
 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxStaticBox)
 wxEND_HANDLERS_TABLE()
 

-wxCONSTRUCTOR_6( wxStaticBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle ) 
+wxCONSTRUCTOR_6( wxStaticBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )

 #else
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 #endif
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 #endif


@@ -112,38 +120,28 @@ bool wxStaticBox::Create(wxWindow *parent,
                          const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
                          const wxString& name)
 {
     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
-    //        wxWindows 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
-                           ) )
-        return FALSE;
+        return false;

 
 

-    // to be transparent we should have the same colour as the parent as well
-    SetBackgroundColour(GetParent()->GetBackgroundColour());
+    if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) )
+        return false;

 
 

-    return TRUE;
+    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;

-    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+    wxGetCharSize(GetHWND(), &cx, &cy, GetFont());

 
     int wBox;
     GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy);
 
     int wBox;
     GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy);


@@ -154,38 +152,47 @@ wxSize wxStaticBox::DoGetBestSize() const
     return wxSize(wBox, hBox);
 }
 
     return wxSize(wBox, hBox);
 }
 

-long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-    switch ( nMsg )
-    {

 #ifndef __WXWINCE__
 #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);
 }
 
 
     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
 #endif // wxUSE_STATBOX

+