X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd71308fc89eac2dd212b715eba68a993fa78f53..ba681060f36767a2682b8547871af2c6f8159955:/src/msw/checkbox.cpp diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp index 32b1b32e2c..1461cf6f4f 100644 --- a/src/msw/checkbox.cpp +++ b/src/msw/checkbox.cpp @@ -22,6 +22,7 @@ #ifndef WX_PRECOMP #include "wx/checkbox.h" +#include "wx/brush.h" #endif #include "wx/msw/private.h" @@ -33,7 +34,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id)) { - wxCommandEvent event(wxEVENT_TYPE_CHECKBOX_COMMAND, m_windowId); + wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId); event.SetInt(GetValue()); event.SetEventObject(this); ProcessCommand(event); @@ -83,9 +84,10 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, // Even with extended styles, need to combine with WS_BORDER // for them to look right. - if (want3D && ((m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) || - (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))) +/* + if ( want3D || wxStyleHasBorder(m_windowStyle) ) msStyle |= WS_BORDER; +*/ m_hWnd = (WXHWND)CreateWindowEx(exStyle, "BUTTON", Label, msStyle, @@ -104,7 +106,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, // Subclass again for purposes of dialog editing mode SubclassWin(m_hWnd); - SetFont(*parent->GetFont()); + SetFont(parent->GetFont()); SetSize(x, y, width, height); @@ -142,7 +144,7 @@ void wxCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags) if ( !str.IsEmpty() ) { - GetTextExtent(str, ¤t_width, &cyf, NULL, NULL, GetFont()); + GetTextExtent(str, ¤t_width, &cyf, NULL, NULL, & this->GetFont()); if (w1 < 0) w1 = (int)(current_width + RADIO_SIZE); if (h1 < 0) @@ -168,6 +170,10 @@ void wxCheckBox::SetValue(bool val) SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0); } +#ifndef BST_CHECKED +#define BST_CHECKED 0x0001 +#endif + bool wxCheckBox::GetValue(void) const { #ifdef __WIN32__