X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81d66cf39f810503baed79213bc3122fda0ccc7b..efeb036598df39027d57d3dd9ea6fafc1232eadb:/src/msw/checkbox.cpp?ds=sidebyside diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp index ebaaec67d5..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; @@ -70,7 +71,9 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, int width = size.x; int height = size.y; - long msStyle = BS_AUTOCHECKBOX|WS_TABSTOP|WS_CHILD; + long msStyle = BS_AUTOCHECKBOX | WS_TABSTOP | WS_CHILD | WS_VISIBLE; + if ( style & wxALIGN_RIGHT ) + msStyle |= BS_LEFTTEXT; // We perhaps have different concepts of 3D here - a 3D border, // versus a 3D button. @@ -81,42 +84,41 @@ 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; +*/ - HWND wx_button = CreateWindowEx(exStyle, "BUTTON", (const char *)Label, - msStyle, - 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, - wxGetInstance(), NULL); + m_hWnd = (WXHWND)CreateWindowEx(exStyle, "BUTTON", Label, + msStyle, + 0, 0, 0, 0, + (HWND)parent->GetHWND(), (HMENU)m_windowId, + wxGetInstance(), NULL); -#if CTL3D +#if wxUSE_CTL3D if (want3D) { - Ctl3dSubclassCtl(wx_button); + Ctl3dSubclassCtl((HWND)m_hWnd); m_useCtl3D = TRUE; } #endif - m_hWnd = (WXHWND) wx_button; - // Subclass again for purposes of dialog editing mode - SubclassWin((WXHWND) wx_button); + SubclassWin(m_hWnd); - SetFont(* parent->GetFont()); + SetFont(parent->GetFont()); SetSize(x, y, width, height); - ShowWindow(wx_button, SW_SHOW); return TRUE; } void wxCheckBox::SetLabel(const wxString& label) { - SetWindowText((HWND) GetHWND(), (const char *)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); @@ -132,31 +134,33 @@ void wxCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags) AdjustForParentClientOrigin(x1, y1, sizeFlags); - char buf[300]; - int current_width, cyf; HWND button = (HWND) GetHWND(); - GetWindowText(button, buf, 300); - if (buf[0]) - { - GetTextExtent(buf, ¤t_width, &cyf, NULL, NULL, GetFont()); - if (w1 < 0) - w1 = (int)(current_width + RADIO_SIZE); - if (h1 < 0) - { - h1 = (int)(cyf); - if (h1 < RADIO_SIZE) - h1 = RADIO_SIZE; - } - } - else + int nLen = GetWindowTextLength(button); + wxString str; + GetWindowText(button, str.GetWriteBuf(nLen), nLen); + str.UngetWriteBuf(); + + if ( !str.IsEmpty() ) + { + GetTextExtent(str, ¤t_width, &cyf, NULL, NULL, & this->GetFont()); + if (w1 < 0) + w1 = (int)(current_width + RADIO_SIZE); + if (h1 < 0) { - if (w1 < 0) - w1 = RADIO_SIZE; - if (h1 < 0) + h1 = (int)(cyf); + if (h1 < RADIO_SIZE) h1 = RADIO_SIZE; } + } + else + { + if (w1 < 0) + w1 = RADIO_SIZE; + if (h1 < 0) + h1 = RADIO_SIZE; + } MoveWindow(button, x1, y1, w1, h1, TRUE); } @@ -166,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); @@ -178,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); @@ -219,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 ) @@ -242,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); @@ -263,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); @@ -299,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); }