cleanup - more reformatting; fixed bug introduced in prior commit

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index deb7761c269ec8e67c6caa86e4caad81a3500594..07b6e67c9fa4e35c66285dbb7c006ce34a10a1b2 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -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"
 


@@ -40,8 +36,11 @@
 #include "wx/sysopt.h"
 #include "wx/image.h"
 #include "wx/dcmemory.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/private.h"

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

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros


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

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

 
     return true;
 }
 
 
     return true;
 }
 

+wxBorder wxStaticBox::GetDefaultBorder() const
+{
+    return wxBORDER_NONE;
+}
+

 WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);
 WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);


@@ -135,7 +142,14 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
     styleWin &= ~WS_CLIPCHILDREN;
 
     if ( exstyle )
     styleWin &= ~WS_CLIPCHILDREN;
 
     if ( exstyle )

-        *exstyle = 0;
+    {
+#ifndef __WXWINCE__
+        if (wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
+            *exstyle = WS_EX_TRANSPARENT;
+        else
+#endif
+            *exstyle = 0;
+    }

 
     return styleWin | BS_GROUPBOX;
 }
 
     return styleWin | BS_GROUPBOX;
 }


@@ -146,17 +160,29 @@ 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(wxStripMenuCodes(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;

 }
 
 }
 

-WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const

 {
 {

+    wxStaticBoxBase::GetBordersForSizer(borderTop, borderOther);
+
+    // need extra space, don't know how much but this seems to be enough
+    *borderTop += GetCharHeight()/3;
+}
+
+// all the hacks below are not necessary for WinCE

 #ifndef __WXWINCE__
 #ifndef __WXWINCE__

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

     if ( nMsg == WM_NCHITTEST )
     {
         // This code breaks some other processing such as enter/leave tracking
     if ( nMsg == WM_NCHITTEST )
     {
         // This code breaks some other processing such as enter/leave tracking


@@ -167,8 +193,8 @@ WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPar
             s_useHTClient = wxSystemOptions::GetOptionInt(wxT("msw.staticbox.htclient"));
         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
+            int xPos = GET_X_LPARAM(lParam);
+            int yPos = GET_Y_LPARAM(lParam);

 
             ScreenToClient(&xPos, &yPos);
 
 
             ScreenToClient(&xPos, &yPos);
 


@@ -178,23 +204,39 @@ WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPar
                 return (long)HTCLIENT;
         }
     }
                 return (long)HTCLIENT;
         }
     }

-#endif // !__WXWINCE__
+
+    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);
 }
 

-void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
-{
-    wxStaticBoxBase::GetBordersForSizer(borderTop, borderOther);
+// ----------------------------------------------------------------------------
+// static box drawing
+// ----------------------------------------------------------------------------

 
 

-    // 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
-}
+/*
+   We draw the static box ourselves because it's the only way to prevent it
+   from flickering horribly on resize (because everything inside the box is
+   erased twice: once when the box itself is repainted and second time when
+   the control inside it is repainted) without using WS_EX_TRANSPARENT style as
+   we used to do and which resulted in other problems.
+ */

 
 // MSWGetRegionWithoutSelf helper: removes the given rectangle from region
 static inline void
 
 // MSWGetRegionWithoutSelf helper: removes the given rectangle from region
 static inline void


@@ -236,79 +278,141 @@ 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);
           child;
           child = ::GetWindow(child, GW_HWNDNEXT) )
     {
 
     // iterate over all child windows (not just wxWindows but all windows)
     for ( HWND child = ::GetWindow(GetHwndOf(GetParent()), GW_CHILD);
           child;
           child = ::GetWindow(child, GW_HWNDNEXT) )
     {

-        wxWindow *childWindow = wxGetWindowFromHWND((WXHWND) child);
+        if ( ! ::IsWindowVisible(child) )
+        {
+            // if the window isn't visible then it doesn't need clipped
+            continue;
+        }

 
 

-        // can't just test for (this != child) here since if a wxStaticBox
-        // overlaps another wxStaticBox then neither are drawn. The overlapping
-        // region will flicker but we shouldn't have overlapping windows anyway.
-        if ( !childWindow || !wxDynamicCast(childWindow, wxStaticBox) )
+        LONG style = ::GetWindowLong(child, GWL_STYLE);
+        wxString str(wxGetWindowClass(child));
+        str.UpperCase();
+        if ( str == wxT("BUTTON") && (style & BS_GROUPBOX) == BS_GROUPBOX )

         {
         {

-            ::GetWindowRect(child, &rc);
-            if ( ::RectInRegion(hrgn, &rc) )
+            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) )
+        {
+            // need to remove WS_CLIPSIBLINGS from all sibling windows
+            // that are within this staticbox if set
+            if ( style & WS_CLIPSIBLINGS )

             {
             {

-                // need to remove WS_CLIPSIBLINGS from all sibling windows
-                // that are within this staticbox if set
-                LONG style = ::GetWindowLong(child, GWL_STYLE);
-                if ( style & WS_CLIPSIBLINGS )
-                {
-                    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."
-                    ::SetWindowPos(child, NULL, 0, 0, 0, 0,
-                                   SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER |
-                                   SWP_FRAMECHANGED);
-                }
-
-                AutoHRGN hrgnChild(::CreateRectRgnIndirect(&rc));
-                ::CombineRgn(hrgn, hrgn, hrgnChild, RGN_DIFF);
+                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."
+                ::SetWindowPos(child, NULL, 0, 0, 0, 0,
+                               SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER |
+                               SWP_FRAMECHANGED);

             }
             }

+
+            AutoHRGN hrgnChild(::CreateRectRgnIndirect(&rc));
+            ::CombineRgn(hrgn, hrgn, hrgnChild, RGN_DIFF);

         }
     }
 
     return (WXHRGN)hrgn;
 }
 
         }
     }
 
     return (WXHRGN)hrgn;
 }
 

-// helper for OnPaint()
+// helper for OnPaint(): really erase the background, i.e. do it even if we
+// don't have any non default brush for doing it (DoEraseBackground() doesn't
+// do anything in such case)

 void wxStaticBox::PaintBackground(wxDC& dc, const RECT& rc)
 {
 void wxStaticBox::PaintBackground(wxDC& dc, const RECT& rc)
 {

-    HBRUSH hbr = (HBRUSH)DoMSWControlColor(GetHdcOf(dc), wxNullColour);
+    // note that we do not use the box background colour here, it shouldn't
+    // apply to its interior for several reasons:
+    //  1. wxGTK doesn't do it
+    //  2. controls inside the box don't get correct bg colour because they
+    //     are not our children so we'd have some really ugly colour mix if
+    //     we did it
+    //  3. this is backwards compatible behaviour and some people rely on it,
+    //     see http://groups.google.com/groups?selm=4252E932.3080801%40able.es
+    wxWindow *parent = GetParent();
+    HBRUSH hbr = (HBRUSH)parent->MSWGetBgBrush(dc.GetHDC(), GetHWND());
+
+    // if there is no special brush for painting this control, just use the
+    // solid background colour
+    wxBrush brush;

     if ( !hbr )
     {
     if ( !hbr )
     {

-        wxBrush *
-            brush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour());
-        if ( brush )
-            hbr = GetHbrushOf(*brush);
+        brush = wxBrush(parent->GetBackgroundColour());
+        hbr = GetHbrushOf(brush);

     }
 
     }
 

-    if ( hbr )
-        ::FillRect(GetHdcOf(dc), &rc, hbr);
+    ::FillRect(GetHdcOf(dc), &rc, hbr);
+}
+
+void wxStaticBox::PaintForeground(wxDC& dc, const RECT& WXUNUSED(rc))
+{
+    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 ( m_hasFgCol && wxUxThemeEngine::GetIfActive() )
+    {
+        // draw over the text in default colour in our colour
+        dc.SetFont(GetFont());
+
+        HDC hdc = GetHdcOf(dc);
+        ::SetTextColor(hdc, GetForegroundColour().GetPixel());
+
+        // FIXME: value of x is hardcoded as this is what it is on my system,
+        //        no idea if it's true everywhere
+        const int y = dc.GetCharHeight();
+        const int x = 9;
+
+        // TODO: RTL?
+        RECT rc = { x, 0, GetSize().x - x, y };
+
+        const wxString label = GetLabel();
+        ::DrawText(hdc, label, label.length(), &rc, DT_SINGLELINE | DT_VCENTER);
+    }

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

-    wxPaintDC dc(this);

     RECT rc;
     ::GetClientRect(GetHwnd(), &rc);
 
     RECT rc;
     ::GetClientRect(GetHwnd(), &rc);
 

-    // draw the entire box in a memory DC, but only blit the bits not redrawn
-    // either by our children windows nor by FillRect() painting the background
-    // below
+    // draw the entire box in a memory DC

     wxMemoryDC memdc;
     wxBitmap bitmap(rc.right, rc.bottom);
     memdc.SelectObject(bitmap);
 
     PaintBackground(memdc, rc);
     wxMemoryDC memdc;
     wxBitmap bitmap(rc.right, rc.bottom);
     memdc.SelectObject(bitmap);
 
     PaintBackground(memdc, rc);

-    MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(memdc), 0);
-
+    PaintForeground(memdc, rc);
+
+    // now only blit the static box border itself, not the interior, to avoid
+    // flicker when background is drawn below
+    //
+    // note that it seems to be faster to do 4 small blits here and then paint
+    // directly into wxPaintDC than painting background in wxMemoryDC and then
+    // blitting everything at once to wxPaintDC, this is why we do it like this
+    wxPaintDC dc(this);

     int borderTop, border;
     GetBordersForSizer(&borderTop, &border);
 
     int borderTop, border;
     GetBordersForSizer(&borderTop, &border);
 


@@ -325,20 +429,22 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
     dc.Blit(rc.right - border, 0, rc.right, rc.bottom,
             &memdc, rc.right - border, 0);
 
     dc.Blit(rc.right - border, 0, rc.right, rc.bottom,
             &memdc, rc.right - border, 0);
 

+
+    // create the region excluding box children

     AutoHRGN hrgn((HRGN)MSWGetRegionWithoutChildren());
     RECT rcWin;
     ::GetWindowRect(GetHwnd(), &rcWin);
     ::OffsetRgn(hrgn, -rcWin.left, -rcWin.top);
 
     AutoHRGN hrgn((HRGN)MSWGetRegionWithoutChildren());
     RECT rcWin;
     ::GetWindowRect(GetHwnd(), &rcWin);
     ::OffsetRgn(hrgn, -rcWin.left, -rcWin.top);
 

-
-    // now remove the box itself
+    // and also the box itself

     MSWGetRegionWithoutSelf((WXHRGN) hrgn, rc.right, rc.bottom);
     MSWGetRegionWithoutSelf((WXHRGN) hrgn, rc.right, rc.bottom);

+    HDCClipper clipToBg(GetHdcOf(dc), hrgn);

 
 

-    // and paint the inside of the box (excluding child controls)
-    ::SelectClipRgn(GetHdcOf(dc), hrgn);
+    // paint the inside of the box (excluding box itself and child controls)

     PaintBackground(dc, rc);
     PaintBackground(dc, rc);

-    ::SelectClipRgn(GetHdcOf(dc), NULL);

 }
 
 }
 

+#endif // !__WXWINCE__
+

 #endif // wxUSE_STATBOX
 
 #endif // wxUSE_STATBOX