missing commit

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 75306978e01fd8d987e3245d23ded74ed416cda0..3a2d88de4c1f630dad43b6e5d5c8aeba46537713 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -33,6 +33,7 @@
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
     #include "wx/image.h"
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
     #include "wx/image.h"

+    #include "wx/sizer.h"

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


@@ -98,11 +99,15 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
     if ( exstyle )
     {
 #ifndef __WXWINCE__
     if ( exstyle )
     {
 #ifndef __WXWINCE__

+        // We may have children inside this static box, so use this style for
+        // TAB navigation to work if we ever use IsDialogMessage() to implement
+        // it (currently we don't because it's too buggy and implement TAB
+        // navigation ourselves, but this could change in the future).
+        *exstyle |= WS_EX_CONTROLPARENT;
+

         if (wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
         if (wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))

-            *exstyle = WS_EX_TRANSPARENT;
-        else
+            *exstyle |= WS_EX_TRANSPARENT;

 #endif
 #endif

-            *exstyle = 0;

     }
 
     styleWin |= BS_GROUPBOX;
     }
 
     styleWin |= BS_GROUPBOX;


@@ -118,6 +123,9 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxStaticBox::DoGetBestSize() const
 {
 
 wxSize wxStaticBox::DoGetBestSize() const
 {

+    wxSize best;
+
+    // Calculate the size needed by the label

     int cx, cy;
     wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
 
     int cx, cy;
     wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
 


@@ -127,8 +135,19 @@ wxSize wxStaticBox::DoGetBestSize() const
     wBox += 3*cx;
     int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
 
     wBox += 3*cx;
     int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
 

-    wxSize best(wBox, hBox);
-    CacheBestSize(best);
+    // If there is a sizer then the base best size is the sizer's minimum
+    if (GetSizer() != NULL)
+    {
+        wxSize cm(GetSizer()->CalcMin());
+        best = ClientToWindowSize(cm);
+        // adjust for a long label if needed
+        best.x = wxMax(best.x, wBox);
+    }
+    // otherwise the best size falls back to the label size
+    else
+    {
+        best = wxSize(wBox, hBox);
+    }

     return best;
 }
 
     return best;
 }
 


@@ -349,6 +368,7 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
     wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
     MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(*impl), 0);
 
     wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
     MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(*impl), 0);
 

+#if wxUSE_UXTHEME

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


@@ -460,16 +480,17 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
         if ( !rtl )
         {
             RECT rc2 = { x, 0, x + width, y };
         if ( !rtl )
         {
             RECT rc2 = { x, 0, x + width, y };

-            ::DrawText(hdc, label.wx_str(), label.length(), &rc2,
+            ::DrawText(hdc, label.t_str(), label.length(), &rc2,

                        drawTextFlags);
         }
         else // RTL
         {
             RECT rc2 = { x, 0, x - width, y };
                        drawTextFlags);
         }
         else // RTL
         {
             RECT rc2 = { x, 0, x - width, y };

-            ::DrawText(hdc, label.wx_str(), label.length(), &rc2,
+            ::DrawText(hdc, label.t_str(), label.length(), &rc2,

                        drawTextFlags | DT_RTLREADING);
         }
     }
                        drawTextFlags | DT_RTLREADING);
         }
     }

+#endif // wxUSE_UXTHEME

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