#ifndef WX_PRECOMP
#include "wx/checkbox.h"
+#include "wx/brush.h"
#endif
#include "wx/msw/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
#endif
-bool wxCheckBox::MSWCommand(const WXUINT WXUNUSED(param), const WXWORD WXUNUSED(id))
+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);
}
// Single check box item
-bool wxCheckBox::Create(wxWindow *parent, const wxWindowID id, const wxString& label,
+bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
- const wxSize& size, const long style,
+ const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
SetValidator(validator);
if (parent) parent->AddChild(this);
- SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
- SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+ SetBackgroundColour(parent->GetBackgroundColour()) ;
+ SetForegroundColour(parent->GetForegroundColour()) ;
m_windowStyle = style;
wxString Label = label;
- if (Label == "")
- Label = " "; // Apparently needed or checkbox won't show
+ if (Label == _T(""))
+ Label = _T(" "); // Apparently needed or checkbox won't show
if ( id == -1 )
m_windowId = NewControlId();
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.
// 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, _T("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(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
y1 = currentY;
- char buf[300];
-
- float current_width;
-
- float cyf;
+ AdjustForParentClientOrigin(x1, y1, sizeFlags);
+ 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);
-
-/*
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
-*/
-
}
-void wxCheckBox::SetValue(const bool val)
+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);
#endif
}
-WXHBRUSH wxCheckBox::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+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);
ProcessCommand (event);
}
-bool wxBitmapCheckBox::Create(wxWindow *parent, const wxWindowID id, const wxBitmap *label,
+bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
const wxPoint& pos,
- const wxSize& size, const long style,
+ const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
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 )
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, _T("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);
return TRUE;
}
-void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
+void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
{
}
-void wxBitmapCheckBox::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxBitmapCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
GetPosition(¤tX, ¤tY);
if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
y1 = currentY;
+ AdjustForParentClientOrigin(x1, y1, sizeFlags);
+
HWND button = (HWND) GetHWND();
/*
if (w1<0)
h1 = checkHeight + FB_MARGIN ;
*/
MoveWindow(button, x1, y1, w1, h1, TRUE);
-
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
}
-void wxBitmapCheckBox::SetValue(const bool val)
+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);
}
projects / wxWidgets.git / blobdiff