X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27fda0b6a1e652dbe8a131796bbc8ca56d95eda0..04a65123066ad12076f42d6ef259eae378e73761:/src/msw/checkbox.cpp diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp index 1beb5c6d35..436706ad41 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); @@ -51,8 +52,8 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, SetValidator(validator); if (parent) parent->AddChild(this); - SetBackgroundColour(parent->GetDefaultBackgroundColour()) ; - SetForegroundColour(parent->GetDefaultForegroundColour()) ; + SetBackgroundColour(parent->GetBackgroundColour()) ; + SetForegroundColour(parent->GetForegroundColour()) ; m_windowStyle = style; @@ -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, @@ -93,7 +95,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, (HWND)parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL); -#if CTL3D +#if wxUSE_CTL3D if (want3D) { Ctl3dSubclassCtl((HWND)m_hWnd); @@ -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); @@ -116,7 +118,7 @@ void wxCheckBox::SetLabel(const wxString& label) SetWindowText((HWND)GetHWND(), label); } -void wxCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags) +void wxCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) { int currentX, currentY; GetPosition(¤tX, ¤tY); @@ -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,7 +170,11 @@ void wxCheckBox::SetValue(bool val) SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0); } -bool wxCheckBox::GetValue(void) const +#ifndef BST_CHECKED +#define BST_CHECKED 0x0001 +#endif + +bool wxCheckBox::GetValue() const { #ifdef __WIN32__ return (SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0) == BST_CHECKED); @@ -180,7 +186,7 @@ bool wxCheckBox::GetValue(void) const WXHBRUSH wxCheckBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { -#if CTL3D +#if wxUSE_CTL3D if ( m_useCtl3D ) { HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); @@ -221,8 +227,8 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l SetValidator(validator); if (parent) parent->AddChild(this); - SetBackgroundColour(parent->GetDefaultBackgroundColour()) ; - SetForegroundColour(parent->GetDefaultForegroundColour()) ; + SetBackgroundColour(parent->GetBackgroundColour()) ; + SetForegroundColour(parent->GetForegroundColour()) ; m_windowStyle = style; if ( id == -1 ) @@ -244,7 +250,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL); -#if CTL3D +#if wxUSE_CTL3D if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS)) { Ctl3dSubclassCtl(wx_button); @@ -265,11 +271,11 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l return TRUE; } -void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap) +void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap) { } -void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags) +void wxBitmapCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) { int currentX, currentY; GetPosition(¤tX, ¤tY); @@ -301,7 +307,7 @@ void wxBitmapCheckBox::SetValue(bool val) SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0); } -bool wxBitmapCheckBox::GetValue(void) const +bool wxBitmapCheckBox::GetValue() const { return ((0x003 & SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0)) == 0x003); }