XRC for wxListbook [patch 1152306] and wxChoicebook. Regenerated makefiles.

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

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 0c07934f056f5acf6c67f4b1da73e0442da3fafe..cdad2d28dafdb742e21438f0d806505834d1e7d0 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -216,38 +216,16 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxButton::DoGetBestSize() const
 {
 
 wxSize wxButton::DoGetBestSize() const
 {

-    int wBtn = 0;
-    int wChar, hChar, hBtn;
-    wxGetCharSize(GetHWND(), &wChar, &hChar, GetFont());
+    wxClientDC dc(wx_const_cast(wxButton *, this));
+    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 
 

-    wxString label = wxGetWindowText(GetHWND());
-    if ( label.find(_T('\n')) != wxString::npos )
-    {
-        wxStringTokenizer tokens( label, wxT("\n") );
-
-        // the button height is proportional to the height of the font used
-        hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
-        hBtn += hChar*(tokens.CountTokens()-1);
-        
-        while (tokens.HasMoreTokens())
-        {
-            wxString sub = tokens.GetNextToken();
-            int w;
-            GetTextExtent( sub, &w, NULL);
-            if (w > wBtn)
-                wBtn = w;
-        }
-    }
-    else
-    {
-        GetTextExtent( label, &wBtn, NULL);
+    wxCoord wBtn,
+            hBtn;
+    dc.GetMultiLineTextExtent(GetLabel(), &wBtn, &hBtn);

 
 

-        // the button height is proportional to the height of the font used
-        hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
-    }
-    

     // add a margin -- the button is wider than just its label
     // add a margin -- the button is wider than just its label

-    wBtn += 3*wChar;
+    wBtn += 3*GetCharWidth();
+    hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hBtn);

 
     // all buttons have at least the standard size unless the user explicitly
     // wants them to be of smaller size and used wxBU_EXACTFIT style when
 
     // all buttons have at least the standard size unless the user explicitly
     // wants them to be of smaller size and used wxBU_EXACTFIT style when