X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/533171c2873027b260f7107451ab22992d9e3926..6d52ca536a0ecb6e69474d30461f6128497505a0:/include/wx/msw/private/button.h

diff --git a/include/wx/msw/private/button.h b/include/wx/msw/private/button.h
index ac6393dc34..f279c3e089 100644
--- a/include/wx/msw/private/button.h
+++ b/include/wx/msw/private/button.h
@@ -11,6 +11,27 @@
 #ifndef _WX_MSW_PRIVATE_BUTTON_H_
 #define _WX_MSW_PRIVATE_BUTTON_H_
 
+// define some standard button constants which may be missing in the headers
+#ifndef BS_PUSHLIKE
+    #define BS_PUSHLIKE 0x00001000L
+#endif
+
+#ifndef BST_UNCHECKED
+    #define BST_UNCHECKED 0x0000
+#endif
+
+#ifndef BST_CHECKED
+    #define BST_CHECKED 0x0001
+#endif
+
+#ifndef BST_INDETERMINATE
+    #define BST_INDETERMINATE 0x0002
+#endif
+
+#ifndef DT_HIDEPREFIX
+    #define DT_HIDEPREFIX 0x00100000
+#endif
+
 namespace wxMSWButton
 {
 
@@ -22,23 +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()
+// (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