Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix for PCH-less build; also moved some functions out of line

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-03 12:24:25 +00:00
parent ebf82d2b4b
commit 4af4dec65f
2 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/wx/msw/private/button.h
View File

@@ -43,53 +43,11 @@ inline int GetMultilineStyle(const wxString& label)
// 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
// depending on whether the label contains the new lines // depending on whether the label contains the new lines
inline void UpdateMultilineStyle(HWND hwnd, const wxString& label) 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);
}
// common implementation of wxButton and wxToggleButton::DoGetBestSize() // common implementation of wxButton and wxToggleButton::DoGetBestSize()
inline wxSize ComputeBestSize(wxControl *btn) // (implemented in src/msw/button.cpp)
{ wxSize ComputeBestSize(wxControl *btn);
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;
}
} // namespace wxMSWButton } // namespace wxMSWButton

52
src/msw/button.cpp
View File

@@ -141,6 +141,57 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
// implementation // implementation
// ============================================================================ // ============================================================================
// ----------------------------------------------------------------------------
// helper functions from wx/msw/private/button.h
// ----------------------------------------------------------------------------
void wxMSWButton::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);
}
wxSize wxMSWButton::ComputeBestSize(wxControl *btn)
{
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;
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// creation/destruction // creation/destruction
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -849,3 +900,4 @@ bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
} }
#endif // wxUSE_BUTTON #endif // wxUSE_BUTTON