Move "static" keyword out from wxDEPRECATED() macros to placate icc.

[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 fbd0d55f36e604f500787eaa64e2bd4016d44a0e..a6c9b64374dfc4a5905dc726be363ca4fbfacd92 100644 (file)
--- a/include/wx/msw/private/button.h
+++ b/include/wx/msw/private/button.h
@@ -28,10 +28,6 @@
     #define BST_INDETERMINATE 0x0002
 #endif
 
-#ifndef DT_HIDEPREFIX
-    #define DT_HIDEPREFIX 0x00100000
-#endif
-
 namespace wxMSWButton
 {
 
@@ -51,15 +47,29 @@ enum
     Size_AuthNeeded = 1
 };
 
-// common implementation of wxButton and wxToggleButton::DoGetBestSize()
-// (implemented in src/msw/button.cpp)
-wxSize ComputeBestSize(wxControl *btn, int flags = 0);
+// NB: All the functions below are implemented in src/msw/button.cpp
 
-// compute the button size (as if wxBU_EXACTFIT were specified, i.e. without
+// 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
 WXDLLIMPEXP_CORE wxSize
 GetFittingSize(wxWindow *win, const wxSize& sizeLabel, int flags = 0);
 
+// Compute the button size (as if wxBU_EXACTFIT were specified) by computing
+// its label size and then calling GetFittingSize().
+wxSize ComputeBestFittingSize(wxControl *btn, int flags = 0);
+
+// Increase the size passed as parameter to be at least the standard button
+// size if the control doesn't have wxBU_EXACTFIT style and also cache it as
+// the best size and return its value -- this is used in DoGetBestSize()
+// implementation.
+wxSize IncreaseToStdSizeAndCache(wxControl *btn, const wxSize& size);
+
+// helper of wxToggleButton::DoGetBestSize()
+inline wxSize ComputeBestSize(wxControl *btn, int flags = 0)
+{
+    return IncreaseToStdSizeAndCache(btn, ComputeBestFittingSize(btn, flags));
+}
+
 } // namespace wxMSWButton
 
 #endif // _WX_MSW_PRIVATE_BUTTON_H_