Removed GetAdjustedBestSize().

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 88e485e64b57e19ecc41ab01e546dedf816c041c..010c6d822c0543364580078fcb4d112c1b88ce63 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/statbox.cpp
+// Name:        src/msw/statbox.cpp

 // Purpose:     wxStaticBox
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxStaticBox
 // Author:      Julian Smart
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "statbox.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,18 +26,19 @@
 
 #if wxUSE_STATBOX
 
 
 #if wxUSE_STATBOX
 

+#include "wx/statbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/dcclient.h"

+    #include "wx/dcmemory.h"
+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "wx/statbox.h"

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

-#include "wx/image.h"
-#include "wx/dcmemory.h"
-#include "wx/sysopt.h"

 
 

+#include "wx/msw/uxtheme.h"

 #include "wx/msw/private.h"
 #include "wx/msw/missing.h"
 
 #include "wx/msw/private.h"
 #include "wx/msw/missing.h"
 


@@ -123,6 +120,9 @@ bool wxStaticBox::Create(wxWindow *parent,
     if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) )
         return false;
 
     if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) )
         return false;
 

+    // Always use LTR layout. Otherwise, the label would be mirrored.
+    SetLayoutDirection(wxLayout_LeftToRight);
+

 #ifndef __WXWINCE__
     if (!wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
         Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint));
 #ifndef __WXWINCE__
     if (!wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
         Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint));


@@ -146,13 +146,23 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 
     if ( exstyle )
     {
 
     if ( exstyle )
     {

+#ifndef __WXWINCE__

         if (wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
             *exstyle = WS_EX_TRANSPARENT;
         else
         if (wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
             *exstyle = WS_EX_TRANSPARENT;
         else

+#endif

             *exstyle = 0;
     }
 
             *exstyle = 0;
     }
 

-    return styleWin | BS_GROUPBOX;
+    styleWin |= BS_GROUPBOX;
+
+    if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+    {
+        // Make sure label is on the right
+        styleWin |= BS_RIGHT;
+    }
+
+    return styleWin;

 }
 
 wxSize wxStaticBox::DoGetBestSize() const
 }
 
 wxSize wxStaticBox::DoGetBestSize() const


@@ -161,12 +171,14 @@ wxSize wxStaticBox::DoGetBestSize() const
     wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
 
     int wBox;
     wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
 
     int wBox;

-    GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy);
+    GetTextExtent(GetLabelText(wxGetWindowText(m_hWnd)), &wBox, &cy);

 
     wBox += 3*cx;
     int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
 
 
     wBox += 3*cx;
     int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
 

-    return wxSize(wBox, hBox);
+    wxSize best(wBox, hBox);
+    CacheBestSize(best);
+    return best;

 }
 
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
 }
 
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const


@@ -204,6 +216,24 @@ WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPar
         }
     }
 
         }
     }
 

+    if ( nMsg == WM_PRINTCLIENT )
+    {
+        // we have to process WM_PRINTCLIENT ourselves as otherwise child
+        // windows' background (eg buttons in radio box) would never be drawn
+        // unless we have a parent with non default background
+
+        // so check first if we have one
+        if ( !HandlePrintClient((WXHDC)wParam) )
+        {
+            // no, we don't, erase the background ourselves
+            // (don't use our own) - see PaintBackground for explanation
+            wxBrush brush(GetParent()->GetBackgroundColour());
+            wxFillRect(GetHwnd(), (HDC)wParam, GetHbrushOf(brush));
+        }
+
+        return 0;
+    }
+

     return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }
 
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }
 


@@ -259,6 +289,7 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren()
     RECT rc;
     ::GetWindowRect(GetHwnd(), &rc);
     HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);
     RECT rc;
     ::GetWindowRect(GetHwnd(), &rc);
     HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);

+    bool foundThis = false;

 
     // iterate over all child windows (not just wxWindows but all windows)
     for ( HWND child = ::GetWindow(GetHwndOf(GetParent()), GW_CHILD);
 
     // iterate over all child windows (not just wxWindows but all windows)
     for ( HWND child = ::GetWindow(GetHwndOf(GetParent()), GW_CHILD);


@@ -270,19 +301,26 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren()
             // if the window isn't visible then it doesn't need clipped
             continue;
         }
             // if the window isn't visible then it doesn't need clipped
             continue;
         }

-        
+

         LONG style = ::GetWindowLong(child, GWL_STYLE);
         wxString str(wxGetWindowClass(child));
         str.UpperCase();
         if ( str == wxT("BUTTON") && (style & BS_GROUPBOX) == BS_GROUPBOX )
         {
         LONG style = ::GetWindowLong(child, GWL_STYLE);
         wxString str(wxGetWindowClass(child));
         str.UpperCase();
         if ( str == wxT("BUTTON") && (style & BS_GROUPBOX) == BS_GROUPBOX )
         {

-            // Don't clip any static boxes, not just this one.  This will
-            // result in flicker in overlapping static boxes, but at least
-            // they will all be drawn correctly and we shouldn't have
-            // overlapping windows anyway.
-            continue;
+            if ( child == GetHwnd() )
+                foundThis = true;
+
+            // Any static boxes below this one in the Z-order can't be clipped
+            // since if we have the case where a static box with a low Z-order
+            // is nested inside another static box with a high Z-order then the
+            // nested static box would be painted over. Doing it this way
+            // unfortunately results in flicker if the Z-order of nested static
+            // boxes is not inside (lowest) to outside (highest) but at least
+            // they are still shown.
+            if ( foundThis )
+                continue;

         }
         }

-        
+

         ::GetWindowRect(child, &rc);
         if ( ::RectInRegion(hrgn, &rc) )
         {
         ::GetWindowRect(child, &rc);
         if ( ::RectInRegion(hrgn, &rc) )
         {


@@ -292,7 +330,7 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren()
             {
                 style &= ~WS_CLIPSIBLINGS;
                 ::SetWindowLong(child, GWL_STYLE, style);
             {
                 style &= ~WS_CLIPSIBLINGS;
                 ::SetWindowLong(child, GWL_STYLE, style);

-                
+

                 // MSDN: "If you have changed certain window data using
                 // SetWindowLong, you must call SetWindowPos to have the
                 // changes take effect."
                 // MSDN: "If you have changed certain window data using
                 // SetWindowLong, you must call SetWindowPos to have the
                 // changes take effect."


@@ -337,13 +375,97 @@ void wxStaticBox::PaintBackground(wxDC& dc, const RECT& rc)
     ::FillRect(GetHdcOf(dc), &rc, hbr);
 }
 
     ::FillRect(GetHdcOf(dc), &rc, hbr);
 }
 

-void wxStaticBox::PaintForeground(wxDC& dc, const RECT& WXUNUSED(rc))
+void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)

 {
 {

-    // NB: neither setting the text colour nor transparent background mode
-    //     doesn't change anything: the static box def window proc still
-    //     draws the label in its own colours, so if we want to have control
-    //     over this we really have to draw everything ourselves

     MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(dc), 0);
     MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(dc), 0);

+
+    // when using XP themes, neither setting the text colour nor transparent
+    // background mode doesn't change anything: the static box def window proc
+    // still draws the label in its own colours, so we need to redraw the text
+    // ourselves if we have a non default fg colour
+    if ( wxUxThemeEngine::GetIfActive() )
+    {
+        // draw over the text in default colour in our colour
+        dc.SetFont(GetFont());
+
+        HDC hdc = GetHdcOf(dc);
+        if ( m_hasFgCol )
+        {
+            ::SetTextColor(hdc, GetForegroundColour().GetPixel());
+        }
+        else
+        {
+            wxUxThemeHandle hTheme(this, L"BUTTON");
+            if (hTheme)
+            {
+                COLORREF col;
+                wxUxThemeEngine::Get()->GetThemeColor(
+                                            hTheme,
+                                            4 /* BP_GROUPBOX */,
+                                            1 /* GBS_NORMAL */,
+                                            3803 /* TMT_TEXTCOLOR */,
+                                            &col);
+
+                ::SetTextColor(hdc, col);
+            }
+            else
+            {
+                // can't open the theme - default to blue
+                ::SetTextColor(hdc, 0x00D54600);
+            }
+        }
+
+        // FIXME: value of x is hardcoded as this is what it is on my system,
+        //        no idea if it's true everywhere
+
+        const bool rtl = wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft;
+        if ( rtl )
+            ::SetTextAlign(hdc, TA_RTLREADING | TA_RIGHT);
+
+        // Get dimensions of the label
+        const wxString label = GetLabel();
+        int width, height;
+        dc.GetTextExtent(wxStripMenuCodes(label, wxStrip_Mnemonics), &width, &height);
+
+        int x;
+        int y = height;
+
+        // first we need to correctly paint the background of the label
+        // as Windows ignores the brush offset when doing it
+        RECT dimensions = {0, 0, 0, y};
+        if ( !rtl )
+        {
+            x = 9;
+            dimensions.left = x;
+            dimensions.right = x + width;
+        }
+        else
+        {
+            x = rc.right - 7;
+            dimensions.left = x - width;
+            dimensions.right = x;
+        }
+
+        // need to adjust the rectangle to cover all the label background
+        dimensions.left -= 2;
+        dimensions.right += 2;
+        dimensions.bottom += 2;
+        PaintBackground(dc, dimensions);
+
+        // now draw the text
+        if ( !rtl )
+        {
+            RECT rc2 = { x, 0, x + width, y };
+            ::DrawText(hdc, label, label.length(), &rc2,
+                       DT_SINGLELINE | DT_VCENTER);
+        }
+        else // RTL
+        {
+            RECT rc2 = { x, 0, x - width, y };
+            ::DrawText(hdc, label, label.length(), &rc2,
+                       DT_SINGLELINE | DT_VCENTER | DT_RTLREADING);
+        }
+    }

 }
 
 void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
 }
 
 void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))


@@ -400,4 +522,3 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
 #endif // !__WXWINCE__
 
 #endif // wxUSE_STATBOX
 #endif // !__WXWINCE__
 
 #endif // wxUSE_STATBOX

-