fixing a few typos, wxAny copy constructor implementation, making wxAnyList available...

[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 f279c3e08919b59e97ade22ca251fdabf339c5fb..a6f2e68a9320f5f497c6734e343d01769fa5a272 100644 (file)
--- a/include/wx/msw/private/button.h
+++ b/include/wx/msw/private/button.h
@@ -28,30 +28,33 @@
     #define BST_INDETERMINATE 0x0002
 #endif
 
     #define BST_INDETERMINATE 0x0002
 #endif
 

-#ifndef DT_HIDEPREFIX
-    #define DT_HIDEPREFIX 0x00100000
-#endif
-

 namespace wxMSWButton
 {
 
 // returns BS_MULTILINE if the label contains new lines or 0 otherwise
 inline int GetMultilineStyle(const wxString& label)
 {
 namespace wxMSWButton
 {
 
 // 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
 // depending on whether the label contains the new lines
 void UpdateMultilineStyle(HWND hwnd, 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
 void UpdateMultilineStyle(HWND hwnd, const wxString& label);
 

+// flags for ComputeBestSize() and GetFittingSize()
+enum
+{
+    Size_AuthNeeded = 1
+};
+

 // common implementation of wxButton and wxToggleButton::DoGetBestSize()
 // (implemented in src/msw/button.cpp)
 // common implementation of wxButton and wxToggleButton::DoGetBestSize()
 // (implemented in src/msw/button.cpp)

-wxSize ComputeBestSize(wxControl *btn);
+wxSize ComputeBestSize(wxControl *btn, int flags = 0);

 
 // 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
 
 // 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);
+WXDLLIMPEXP_CORE wxSize
+GetFittingSize(wxWindow *win, const wxSize& sizeLabel, int flags = 0);

 
 } // namespace wxMSWButton
 
 
 } // namespace wxMSWButton