add missing public keyword for base class

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 75306978e01fd8d987e3245d23ded74ed416cda0..c86566cf0b701ebb29312b8d3733934afbc2c01c 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -118,6 +118,9 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxStaticBox::DoGetBestSize() const
 {
+    wxSize best;
+
+    // Calculate the size needed by the label
     int cx, cy;
     wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
 
@@ -127,8 +130,19 @@ wxSize wxStaticBox::DoGetBestSize() const
     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;
 }
 
@@ -460,13 +474,13 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
         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 };
-            ::DrawText(hdc, label.wx_str(), label.length(), &rc2,
+            ::DrawText(hdc, label.t_str(), label.length(), &rc2,
                        drawTextFlags | DT_RTLREADING);
         }
     }
@@ -528,4 +542,26 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
 
 #endif // !__WXWINCE__
 
+
+wxPoint wxStaticBox::GetClientAreaOrigin() const
+{
+    // See: http://msdn.microsoft.com/en-us/library/aa511279.aspx
+    wxPoint pt = ConvertDialogToPixels(wxPoint(6,11));
+    return pt;
+}
+
+
+void wxStaticBox::DoGetClientSize(int *width, int *height) const
+{
+    // See: http://msdn.microsoft.com/en-us/library/aa511279.aspx
+    wxPoint lr = ConvertDialogToPixels(wxPoint(6,7));
+    wxPoint ul = GetClientAreaOrigin();
+    wxSize  sz = GetSize();
+    
+    if (width)
+        *width = sz.x - ul.x - lr.x;
+    if (height)
+        *height = sz.y - ul.y - lr.x;
+}
+
 #endif // wxUSE_STATBOX