#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)
{
- 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
-inline void UpdateMultilineStyle(HWND hwnd, const wxString& label)
+void UpdateMultilineStyle(HWND hwnd, const wxString& label);
+
+// flags for ComputeBestSize() and GetFittingSize()
+enum
{
- // 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);
-}
+ Size_AuthNeeded = 1
+};
+
+// 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
+// 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);
-// common implementation of wxButton and wxToggleButton::DoGetBestSize()
-inline wxSize ComputeBestSize(wxControl *btn)
+// helper of wxToggleButton::DoGetBestSize()
+inline wxSize ComputeBestSize(wxControl *btn, int flags = 0)
{
- 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;
+ return IncreaseToStdSizeAndCache(btn, ComputeBestFittingSize(btn, flags));
}
} // namespace wxMSWButton