X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81d66cf39f810503baed79213bc3122fda0ccc7b..3995f8eb97f3fa807fb7d805bb8b86425f490b06:/src/msw/checkbox.cpp diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp index ebaaec67d5..bffacc0344 100644 --- a/src/msw/checkbox.cpp +++ b/src/msw/checkbox.cpp @@ -6,38 +6,59 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation "checkbox.h" + #pragma implementation "checkbox.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/checkbox.h" + #include "wx/checkbox.h" + #include "wx/brush.h" #endif #include "wx/msw/private.h" +// ---------------------------------------------------------------------------- +// macros +// ---------------------------------------------------------------------------- + #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) -IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) + IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) + IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) #endif +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxCheckBox +// ---------------------------------------------------------------------------- + bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id)) { - wxCommandEvent event(wxEVENT_TYPE_CHECKBOX_COMMAND, m_windowId); - event.SetInt(GetValue()); - event.SetEventObject(this); - ProcessCommand(event); - return TRUE; + wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId); + event.SetInt(GetValue()); + event.SetEventObject(this); + ProcessCommand(event); + return TRUE; } // Single check box item @@ -47,142 +68,125 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxValidator& validator, const wxString& name) { - SetName(name); - SetValidator(validator); - if (parent) parent->AddChild(this); - - SetBackgroundColour(parent->GetDefaultBackgroundColour()) ; - SetForegroundColour(parent->GetDefaultForegroundColour()) ; + SetName(name); + SetValidator(validator); + if (parent) parent->AddChild(this); - m_windowStyle = style; + SetBackgroundColour(parent->GetBackgroundColour()) ; + SetForegroundColour(parent->GetForegroundColour()) ; - wxString Label = label; - if (Label == "") - Label = " "; // Apparently needed or checkbox won't show + m_windowStyle = style; - if ( id == -1 ) - m_windowId = NewControlId(); - else - m_windowId = id; + wxString Label = label; + if (Label == wxT("")) + Label = wxT(" "); // Apparently needed or checkbox won't show - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - - long msStyle = BS_AUTOCHECKBOX|WS_TABSTOP|WS_CHILD; - - // 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 - // in the style. - bool want3D; - WXDWORD exStyle = Determine3DEffects(0, &want3D) ; - - // 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))) - 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); - -#if CTL3D - if (want3D) - { - Ctl3dSubclassCtl(wx_button); - m_useCtl3D = TRUE; - } + if ( id == -1 ) + m_windowId = NewControlId(); + else + m_windowId = id; + + int x = pos.x; + int y = pos.y; + int width = size.x; + int height = size.y; + + 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. + // So we only wish to give a border if this is specified + // in the style. + bool want3D; + WXDWORD exStyle = Determine3DEffects(0, &want3D) ; + + // Even with extended styles, need to combine with WS_BORDER + // for them to look right. + /* + if ( want3D || wxStyleHasBorder(m_windowStyle) ) + msStyle |= WS_BORDER; + */ + + m_hWnd = (WXHWND)CreateWindowEx(exStyle, wxT("BUTTON"), Label, + msStyle, + 0, 0, 0, 0, + (HWND)parent->GetHWND(), (HMENU)m_windowId, + wxGetInstance(), NULL); + +#if wxUSE_CTL3D + if (want3D) + { + Ctl3dSubclassCtl(GetHwnd()); + m_useCtl3D = TRUE; + } #endif - m_hWnd = (WXHWND) wx_button; + // Subclass again for purposes of dialog editing mode + SubclassWin(m_hWnd); - // Subclass again for purposes of dialog editing mode - SubclassWin((WXHWND) wx_button); - - SetFont(* parent->GetFont()); + SetFont(parent->GetFont()); - SetSize(x, y, width, height); + SetSize(x, y, width, height); - ShowWindow(wx_button, SW_SHOW); - return TRUE; + return TRUE; } void wxCheckBox::SetLabel(const wxString& label) { - SetWindowText((HWND) GetHWND(), (const char *)label); + SetWindowText(GetHwnd(), label); } -void wxCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags) +wxSize wxCheckBox::DoGetBestSize() { - int currentX, currentY; - GetPosition(¤tX, ¤tY); - int x1 = x; - int y1 = y; - int w1 = width; - int h1 = height; - - if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - x1 = currentX; - if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - y1 = currentY; - - AdjustForParentClientOrigin(x1, y1, sizeFlags); + int wCheckbox, hCheckbox; - char buf[300]; + wxString str = wxGetWindowText(GetHWND()); - int current_width, cyf; - HWND button = (HWND) GetHWND(); - - GetWindowText(button, buf, 300); - if (buf[0]) + if ( !str.IsEmpty() ) { - 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; - } + GetTextExtent(str, &wCheckbox, &hCheckbox); + wCheckbox += RADIO_SIZE; + + if ( hCheckbox < RADIO_SIZE ) + hCheckbox = RADIO_SIZE; } else { - if (w1 < 0) - w1 = RADIO_SIZE; - if (h1 < 0) - h1 = RADIO_SIZE; + wCheckbox = RADIO_SIZE; + hCheckbox = RADIO_SIZE; } - MoveWindow(button, x1, y1, w1, h1, TRUE); + return wxSize(wCheckbox, hCheckbox); } void wxCheckBox::SetValue(bool val) { - SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0); + SendMessage(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); + return (SendMessage(GetHwnd(), BM_GETCHECK, 0, 0) == BST_CHECKED); #else - return ((0x003 & SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0)) == 0x003); + return ((0x003 & SendMessage(GetHwnd(), BM_GETCHECK, 0, 0)) == 0x003); #endif } WXHBRUSH wxCheckBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam) + WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { -#if CTL3D +#if wxUSE_CTL3D if ( m_useCtl3D ) { HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); - + return (WXHBRUSH) hbrush; } #endif @@ -209,6 +213,10 @@ void wxCheckBox::Command (wxCommandEvent & event) ProcessCommand (event); } +// ---------------------------------------------------------------------------- +// wxBitmapCheckBox +// ---------------------------------------------------------------------------- + bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label, const wxPoint& pos, const wxSize& size, long style, @@ -219,14 +227,14 @@ 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 ) - m_windowId = NewControlId(); - else - m_windowId = id; + if ( id == -1 ) + m_windowId = NewControlId(); + else + m_windowId = id; int x = pos.x; int y = pos.y; @@ -237,16 +245,16 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l checkHeight = -1 ; long msStyle = CHECK_FLAGS; - HWND wx_button = CreateWindowEx(MakeExtendedStyle(m_windowStyle), CHECK_CLASS, "toggle", + HWND wx_button = CreateWindowEx(MakeExtendedStyle(m_windowStyle), CHECK_CLASS, wxT("toggle"), msStyle, 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); - m_useCtl3D = TRUE; + m_useCtl3D = TRUE; } #endif @@ -255,53 +263,14 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l // Subclass again for purposes of dialog editing mode SubclassWin((WXHWND)wx_button); -// SetFont(parent->GetFont()); - SetSize(x, y, width, height); ShowWindow(wx_button, SW_SHOW); - return TRUE; -} - -void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap) -{ -} -void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags) -{ - int currentX, currentY; - GetPosition(¤tX, ¤tY); - - int x1 = x; - int y1 = y; - int w1 = width; - int h1 = height; - - if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - x1 = currentX; - if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - y1 = currentY; - - AdjustForParentClientOrigin(x1, y1, sizeFlags); - - HWND button = (HWND) GetHWND(); -/* - if (w1<0) - w1 = checkWidth + FB_MARGIN ; - if (h1<0) - h1 = checkHeight + FB_MARGIN ; -*/ - MoveWindow(button, x1, y1, w1, h1, TRUE); -} - -void wxBitmapCheckBox::SetValue(bool val) -{ - SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0); + return TRUE; } -bool wxBitmapCheckBox::GetValue(void) const +void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap) { - return ((0x003 & SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0)) == 0x003); + wxFAIL_MSG(wxT("not implemented")); } - -