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

Correct best size computation for wxCheckBox with borders under MSW.

Browse Source 
As wxCheckBox can now have borders (see previous commit), we must override
DoGetBestClientSize() and not DoGetBestSize() in it to take account of them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-09-23 22:48:16 +00:00
parent 687823a157
commit e380ca3cf8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/checkbox.h
View File

@@ -59,7 +59,7 @@ public:
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestClientSize() const;
virtual void DoSet3StateValue(wxCheckBoxState value); virtual void DoSet3StateValue(wxCheckBoxState value);
virtual wxCheckBoxState DoGet3StateValue() const; virtual wxCheckBoxState DoGet3StateValue() const;

2
src/msw/checkbox.cpp
View File

@@ -134,7 +134,7 @@ WXDWORD wxCheckBox::MSWGetStyle(long style, WXDWORD *exstyle) const
// wxCheckBox geometry // wxCheckBox geometry
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxSize wxCheckBox::DoGetBestSize() const wxSize wxCheckBox::DoGetBestClientSize() const
{ {
static int s_checkSize = 0; static int s_checkSize = 0;