Some change logs

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

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 466fb5484d981a815ee5523f67e20a60a6081e22..cc4b995d2d3469654b5d54d026e62d7d2306f68a 100644 (file)
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -126,27 +126,6 @@ WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
     return msStyle;
 }
 
     return msStyle;
 }
 

-WXHBRUSH wxStaticText::DoMSWControlColor(WXHDC pDC, wxColour colBg)
-{
-    // If this control has a non-standard fg colour but still has the standard
-    // bg then we need to also give it a non-standard bg otherwise the fg
-    // setting has no effect.
-    WXHBRUSH hbr = wxControl::DoMSWControlColor(pDC, colBg);
-    if (!hbr && m_hasFgCol)
-    {
-        hbr = MSWGetBgBrushForChild(pDC, this);
-        if (!hbr)
-        {
-            HDC hdc = (HDC)pDC;
-            wxColour bg = GetBackgroundColour();
-            ::SetBkColor(hdc, wxColourToRGB(bg));
-            wxBrush *brush = wxTheBrushList->FindOrCreateBrush(bg, wxSOLID);
-            hbr = (WXHBRUSH)brush->GetResourceHandle();
-        }
-    }
-    return hbr;
-}
-

 wxSize wxStaticText::DoGetBestSize() const
 {
     wxClientDC dc(wx_const_cast(wxStaticText *, this));
 wxSize wxStaticText::DoGetBestSize() const
 {
     wxClientDC dc(wx_const_cast(wxStaticText *, this));


@@ -164,7 +143,9 @@ wxSize wxStaticText::DoGetBestSize() const
         widthTextMax += 2;
 #endif // __WXWINCE__
 
         widthTextMax += 2;
 #endif // __WXWINCE__
 

-    return wxSize(widthTextMax, heightTextTotal);
+    wxSize best(widthTextMax, heightTextTotal);
+    CacheBestSize(best);
+    return best;

 }
 
 void wxStaticText::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 }
 
 void wxStaticText::DoSetSize(int x, int y, int w, int h, int sizeFlags)