Rebake from clean wx tree.

[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 c50aa5a311b4f98eb0867b3422606e4dc671e589..7d006f747a702429ae330f776b50e4d04b0ac408 100644 (file)
--- a/include/wx/msw/private/button.h
+++ b/include/wx/msw/private/button.h
@@ -38,7 +38,7 @@ namespace wxMSWButton
 // returns BS_MULTILINE if the label contains new lines or 0 otherwise
 inline int GetMultilineStyle(const wxString& label)
 {
 // returns BS_MULTILINE if the label contains new lines or 0 otherwise
 inline int GetMultilineStyle(const wxString& label)
 {

-    return label.find(_T('\n')) == wxString::npos ? 0 : BS_MULTILINE;
+    return label.find(wxT('\n')) == wxString::npos ? 0 : BS_MULTILINE;

 }
 
 // update the style of the specified HWND to include or exclude BS_MULTILINE
 }
 
 // update the style of the specified HWND to include or exclude BS_MULTILINE


@@ -49,6 +49,10 @@ void UpdateMultilineStyle(HWND hwnd, const wxString& label);
 // (implemented in src/msw/button.cpp)
 wxSize ComputeBestSize(wxControl *btn);
 
 // (implemented in src/msw/button.cpp)
 wxSize ComputeBestSize(wxControl *btn);
 

+// 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
 
 #endif // _WX_MSW_PRIVATE_BUTTON_H_
 } // namespace wxMSWButton
 
 #endif // _WX_MSW_PRIVATE_BUTTON_H_