From 9b9a7c3331eda5d674e3f67eb0add00df1bcf907 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 20 Sep 2012 22:15:37 +0000 Subject: [PATCH] Add public (but not documented) wxCheckBox::MSWMakeOwnerDrawn(). It can be useful to explicitly make a check box owner drawn, so make the private MakeOwnerDrawn() public and add "MSW" prefix to it to allow doing this from the user code. Closes #14679. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/checkbox.h | 6 +++--- src/msw/checkbox.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h index 275fed537b..f00fe9cfe3 100644 --- a/include/wx/msw/checkbox.h +++ b/include/wx/msw/checkbox.h @@ -52,15 +52,15 @@ public: // returns true if the platform should explicitly apply a theme border virtual bool CanApplyThemeBorder() const { return false; } + // make the checkbox owner drawn or reset it to normal style + void MSWMakeOwnerDrawn(bool ownerDrawn); + protected: virtual wxSize DoGetBestSize() const; virtual void DoSet3StateValue(wxCheckBoxState value); virtual wxCheckBoxState DoGet3StateValue() const; - // make the checkbox owner drawn or reset it to normal style - void MakeOwnerDrawn(bool ownerDrawn); - // return true if this checkbox is owner drawn bool IsOwnerDrawn() const; diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp index fed760a4a5..85a52a49cc 100644 --- a/src/msw/checkbox.cpp +++ b/src/msw/checkbox.cpp @@ -273,7 +273,7 @@ bool wxCheckBox::SetForegroundColour(const wxColour& colour) // the only way to change the checkbox foreground colour under Windows XP // is to owner draw it if ( wxUxThemeEngine::GetIfActive() ) - MakeOwnerDrawn(colour.IsOk()); + MSWMakeOwnerDrawn(colour.IsOk()); return true; } @@ -284,7 +284,7 @@ bool wxCheckBox::IsOwnerDrawn() const (::GetWindowLong(GetHwnd(), GWL_STYLE) & BS_OWNERDRAW) == BS_OWNERDRAW; } -void wxCheckBox::MakeOwnerDrawn(bool ownerDrawn) +void wxCheckBox::MSWMakeOwnerDrawn(bool ownerDrawn) { long style = ::GetWindowLong(GetHwnd(), GWL_STYLE); -- 2.45.2