X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..c4218a74033e3091a3566c9c6619809a00b53744:/src/msw/checkbox.cpp diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp index c838a433cb..24a3e7ce5b 100644 --- a/src/msw/checkbox.cpp +++ b/src/msw/checkbox.cpp @@ -104,6 +104,9 @@ bool wxCheckBox::Create(wxWindow *parent, if ( style & wxALIGN_RIGHT ) msStyle |= BS_LEFTTEXT; + if ( style & wxCLIP_SIBLINGS ) + msStyle |= WS_CLIPSIBLINGS; + // We perhaps have different concepts of 3D here - a 3D border, // versus a 3D button. // So we only wish to give a border if this is specified @@ -156,10 +159,7 @@ wxSize wxCheckBox::DoGetBestSize() const wxScreenDC dc; dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); - // the height of a standard button in the dialog units is 8, - // translate this to pixels (as one dialog unit is precisely equal to - // 8 character heights, it's just the char height) - s_checkSize = dc.GetCharHeight(); + s_checkSize = (3*dc.GetCharHeight())/2; } wxString str = wxGetWindowText(GetHWND()); @@ -210,7 +210,7 @@ void wxCheckBox::Command (wxCommandEvent & event) // wxBitmapCheckBox // ---------------------------------------------------------------------------- -bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label, +bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *WXUNUSED(label), const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, @@ -265,7 +265,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l return TRUE; } -void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap) +void wxBitmapCheckBox::SetLabel(const wxBitmap& WXUNUSED(bitmap)) { wxFAIL_MSG(wxT("not implemented")); }