compilation fix for PCH-less build; also moved some functions out of line

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/private/button.h b/include/wx/msw/private/button.h
index 97b6de86c0e3ed345cc6e685d62e742de407f38d..c50aa5a311b4f98eb0867b3422606e4dc671e589 100644 (file)
--- a/include/wx/msw/private/button.h
+++ b/include/wx/msw/private/button.h
@@ -43,53 +43,11 @@ 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);
-
-    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;
-}
+// (implemented in src/msw/button.cpp)
+wxSize ComputeBestSize(wxControl *btn);
 
 } // namespace wxMSWButton
 

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index e970d5a6fb000c84707bcd08ece707edc7e88663..893dd883014cde0c5522ed8cf49987e1a4526ecc 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -141,6 +141,57 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 // implementation
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// helper functions from wx/msw/private/button.h
+// ----------------------------------------------------------------------------
+
+void wxMSWButton::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);
+}
+
+wxSize wxMSWButton::ComputeBestSize(wxControl *btn)
+{
+    wxClientDC dc(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;
+}
+
 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
@@ -849,3 +900,4 @@ bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
 }
 
 #endif // wxUSE_BUTTON
+