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

support multiline labels in wxCheckBox (#9495)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-06-07 01:54:44 +00:00
parent d7006f4409
commit 533171c287
5 changed files with 66 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/msw/checkbox.cpp
View File

@@ -35,8 +35,9 @@
#endif
#include "wx/msw/dc.h" // for wxDCTemp
#include "wx/msw/uxtheme.h"
#include "wx/renderer.h"
#include "wx/msw/uxtheme.h"
#include "wx/msw/private/button.h"
// ----------------------------------------------------------------------------
// constants
@@ -188,6 +189,8 @@ bool wxCheckBox::Create(wxWindow *parent,
msStyle |= BS_LEFTTEXT | BS_RIGHT;
}
msStyle |= wxMSWButton::GetMultilineStyle(label);
return MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, 0);
}
@@ -212,7 +215,9 @@ wxSize wxCheckBox::DoGetBestSize() const
int wCheckbox, hCheckbox;
if ( !str.empty() )
{
GetTextExtent(GetLabelText(str), &wCheckbox, &hCheckbox);
wxClientDC dc(wx_const_cast(wxCheckBox *, this));
dc.SetFont(GetFont());
dc.GetMultiLineTextExtent(GetLabelText(str), &wCheckbox, &hCheckbox);
wCheckbox += s_checkSize + GetCharWidth();
if ( hCheckbox < s_checkSize )
@@ -236,6 +241,13 @@ wxSize wxCheckBox::DoGetBestSize() const
// wxCheckBox operations
// ----------------------------------------------------------------------------
void wxCheckBox::SetLabel(const wxString& label)
{
wxMSWButton::UpdateMultilineStyle(GetHwnd(), label);
wxCheckBoxBase::SetLabel(label);
}
void wxCheckBox::SetValue(bool val)
{
Set3StateValue(val ? wxCHK_CHECKED : wxCHK_UNCHECKED);