extact common GAddress declarations to the common header instead of duplicating them...

[wxWidgets.git] / include / wx / msw / private / button.h

diff --git a/include/wx/msw/private/button.h b/include/wx/msw/private/button.h
index 97b6de86c0e3ed345cc6e685d62e742de407f38d..f279c3e08919b59e97ade22ca251fdabf339c5fb 100644 (file)
--- a/include/wx/msw/private/button.h
+++ b/include/wx/msw/private/button.h
@@ -43,53 +43,15 @@ inline int GetMultilineStyle(const wxString& label)
 
 // update the style of the specified HWND to include or exclude BS_MULTILINE
 // depending on whether the label contains the new lines
-inline void UpdateMultilineStyle(HWND hwnd, const wxString& label)
-{
-    // update BS_MULTILINE style depending on the new label (resetting it
-    // doesn't seem to do anything very useful but it shouldn't hurt and we do
-    // have to set it whenever the label becomes multi line as otherwise it
-    // wouldn't be shown correctly as we don't use BS_MULTILINE when creating
-    // the control unless it already has new lines in its label)
-    long styleOld = ::GetWindowLong(hwnd, GWL_STYLE),
-         styleNew;
-    if ( label.find(_T('\n')) != wxString::npos )
-        styleNew = styleOld | BS_MULTILINE;
-    else
-        styleNew = styleOld & ~BS_MULTILINE;
-
-    if ( styleNew != styleOld )
-        ::SetWindowLong(hwnd, GWL_STYLE, styleNew);
-}
+void UpdateMultilineStyle(HWND hwnd, const wxString& label);
 
 // common implementation of wxButton and wxToggleButton::DoGetBestSize()
-inline wxSize ComputeBestSize(wxControl *btn)
-{
-    wxClientDC dc(btn);
+// (implemented in src/msw/button.cpp)
+wxSize ComputeBestSize(wxControl *btn);
 
-    wxCoord wBtn,
-            hBtn;
-    dc.GetMultiLineTextExtent(btn->GetLabelText(), &wBtn, &hBtn);
-
-    // FIXME: this is pure guesswork, need to retrieve the real button margins
-    wBtn += 3*btn->GetCharWidth();
-    hBtn = 11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(hBtn)/10;
-
-    // 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
-    // creating the button
-    if ( !btn->HasFlag(wxBU_EXACTFIT) )
-    {
-        wxSize sz = wxButton::GetDefaultSize();
-        if ( wBtn < sz.x )
-            wBtn = sz.x;
-        if ( hBtn < sz.y )
-            hBtn = sz.y;
-    }
-
-    wxSize best(wBtn, hBtn);
-    btn->CacheBestSize(best);
-    return best;
-}
+// compute the button size (as if wxBU_EXACTFIT were specified, i.e. without
+// adjusting it to be of default size if it's smaller) for the given label size
+wxSize GetFittingSize(wxWindow *win, const wxSize& sizeLabel);
 
 } // namespace wxMSWButton