X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/533171c2873027b260f7107451ab22992d9e3926..54e660f85e8525cc0d0cb0ca7a5c01f931e3ed62:/src/msw/checkbox.cpp?ds=sidebyside diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp index 44645f3b72..bc59d8ad1a 100644 --- a/src/msw/checkbox.cpp +++ b/src/msw/checkbox.cpp @@ -30,6 +30,7 @@ #ifndef WX_PRECOMP #include "wx/brush.h" + #include "wx/dcclient.h" #include "wx/dcscreen.h" #include "wx/settings.h" #endif @@ -43,22 +44,6 @@ // constants // ---------------------------------------------------------------------------- -#ifndef BST_UNCHECKED - #define BST_UNCHECKED 0x0000 -#endif - -#ifndef BST_CHECKED - #define BST_CHECKED 0x0001 -#endif - -#ifndef BST_INDETERMINATE - #define BST_INDETERMINATE 0x0002 -#endif - -#ifndef DT_HIDEPREFIX - #define DT_HIDEPREFIX 0x00100000 -#endif - #ifndef BP_CHECKBOX #define BP_CHECKBOX 3 #endif @@ -215,7 +200,7 @@ wxSize wxCheckBox::DoGetBestSize() const int wCheckbox, hCheckbox; if ( !str.empty() ) { - wxClientDC dc(wx_const_cast(wxCheckBox *, this)); + wxClientDC dc(const_cast(this)); dc.SetFont(GetFont()); dc.GetMultiLineTextExtent(GetLabelText(str), &wCheckbox, &hCheckbox); wCheckbox += s_checkSize + GetCharWidth();