#ifndef WX_PRECOMP
#include "wx/brush.h"
+ #include "wx/dcclient.h"
#include "wx/dcscreen.h"
#include "wx/settings.h"
#endif
#include "wx/renderer.h"
#include "wx/msw/uxtheme.h"
#include "wx/msw/private/button.h"
+#include "wx/msw/missing.h"
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
-#ifndef BST_UNCHECKED
- #define BST_UNCHECKED 0x0000
-#endif
-
-#ifndef BST_CHECKED
- #define BST_CHECKED 0x0001
-#endif
-
-#ifndef BST_INDETERMINATE
- #define BST_INDETERMINATE 0x0002
-#endif
-
-#ifndef DT_HIDEPREFIX
- #define DT_HIDEPREFIX 0x00100000
-#endif
-
#ifndef BP_CHECKBOX
#define BP_CHECKBOX 3
#endif
// implementation
// ============================================================================
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxCheckBoxStyle )
-
-wxBEGIN_FLAGS( wxCheckBoxStyle )
- // new style border flags, we put them first to
- // use them for streaming out
- wxFLAGS_MEMBER(wxBORDER_SIMPLE)
- wxFLAGS_MEMBER(wxBORDER_SUNKEN)
- wxFLAGS_MEMBER(wxBORDER_DOUBLE)
- wxFLAGS_MEMBER(wxBORDER_RAISED)
- wxFLAGS_MEMBER(wxBORDER_STATIC)
- wxFLAGS_MEMBER(wxBORDER_NONE)
-
- // old style border flags
- wxFLAGS_MEMBER(wxSIMPLE_BORDER)
- wxFLAGS_MEMBER(wxSUNKEN_BORDER)
- wxFLAGS_MEMBER(wxDOUBLE_BORDER)
- wxFLAGS_MEMBER(wxRAISED_BORDER)
- wxFLAGS_MEMBER(wxSTATIC_BORDER)
- wxFLAGS_MEMBER(wxNO_BORDER)
-
- // standard window styles
- wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
- wxFLAGS_MEMBER(wxCLIP_CHILDREN)
- wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
- wxFLAGS_MEMBER(wxWANTS_CHARS)
- wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
- wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
- wxFLAGS_MEMBER(wxVSCROLL)
- wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxCheckBoxStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckBox, wxControl,"wx/checkbox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxCheckBox)
- wxEVENT_PROPERTY( Click , wxEVT_COMMAND_CHECKBOX_CLICKED , wxCommandEvent )
-
- wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( Value ,bool, SetValue, GetValue, EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY_FLAGS( WindowStyle , wxCheckBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxCheckBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxCheckBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
-#endif
-
-
// ----------------------------------------------------------------------------
// wxCheckBox creation
// ----------------------------------------------------------------------------
{
Init();
+ WXValidateStyle(&style);
if ( !CreateControl(parent, id, pos, size, style, validator, name) )
return false;
- long msStyle = WS_TABSTOP;
+ WXDWORD exstyle;
+ WXDWORD msStyle = MSWGetStyle(style, &exstyle);
+
+ msStyle |= wxMSWButton::GetMultilineStyle(label);
+
+ return MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, exstyle);
+}
+
+WXDWORD wxCheckBox::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+ // buttons never have an external border, they draw their own one
+ WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
if ( style & wxCHK_3STATE )
- {
msStyle |= BS_3STATE;
- }
else
- {
- wxASSERT_MSG( !Is3rdStateAllowedForUser(),
- wxT("Using wxCH_ALLOW_3RD_STATE_FOR_USER")
- wxT(" style flag for a 2-state checkbox is useless") );
msStyle |= BS_CHECKBOX;
- }
if ( style & wxALIGN_RIGHT )
{
msStyle |= BS_LEFTTEXT | BS_RIGHT;
}
- msStyle |= wxMSWButton::GetMultilineStyle(label);
-
- return MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, 0);
+ return msStyle;
}
// ----------------------------------------------------------------------------
// wxCheckBox geometry
// ----------------------------------------------------------------------------
-wxSize wxCheckBox::DoGetBestSize() const
+wxSize wxCheckBox::DoGetBestClientSize() const
{
static int s_checkSize = 0;
int wCheckbox, hCheckbox;
if ( !str.empty() )
{
- wxClientDC dc(wx_const_cast(wxCheckBox *, this));
+ wxClientDC dc(const_cast<wxCheckBox *>(this));
dc.SetFont(GetFont());
dc.GetMultiLineTextExtent(GetLabelText(str), &wCheckbox, &hCheckbox);
wCheckbox += s_checkSize + GetCharWidth();
+ if ( ::GetWindowLong(GetHwnd(), GWL_STYLE) & BS_MULTILINE )
+ {
+ // We need to make the checkbox even wider in this case because
+ // otherwise it wraps lines automatically and not only on "\n"s as
+ // we need and this makes the size computed here wrong resulting in
+ // checkbox contents being truncated when it's actually displayed.
+ // Without this hack simple checkbox with "Some thing\n and more"
+ // label appears on 3 lines, not 2, under Windows 2003 using
+ // classic look and feel (although it works fine under Windows 7,
+ // with or without themes).
+ wCheckbox += s_checkSize;
+ }
+
if ( hCheckbox < s_checkSize )
hCheckbox = s_checkSize;
}
// generate the event
- wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId);
+ wxCommandEvent event(wxEVT_CHECKBOX, m_windowId);
event.SetInt(state);
event.SetEventObject(this);
// the only way to change the checkbox foreground colour under Windows XP
// is to owner draw it
if ( wxUxThemeEngine::GetIfActive() )
- MakeOwnerDrawn(colour.Ok());
+ MSWMakeOwnerDrawn(colour.IsOk());
return true;
}
(::GetWindowLong(GetHwnd(), GWL_STYLE) & BS_OWNERDRAW) == BS_OWNERDRAW;
}
-void wxCheckBox::MakeOwnerDrawn(bool ownerDrawn)
+void wxCheckBox::MSWMakeOwnerDrawn(bool ownerDrawn)
{
long style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
RECT& rect = dis->rcItem;
RECT rectCheck,
rectLabel;
- rectCheck.top =
- rectLabel.top = rect.top;
- rectCheck.bottom =
- rectLabel.bottom = rect.bottom;
- const int checkSize = GetBestSize().y;
+ rectLabel.top = rect.top + (rect.bottom - rect.top - GetBestSize().y) / 2;
+ rectLabel.bottom = rectLabel.top + GetBestSize().y;
const int MARGIN = 3;
+ const int CXMENUCHECK = ::GetSystemMetrics(SM_CXMENUCHECK);
+ // the space between the checkbox and the label is included in the
+ // check-mark bitmap
+ const int checkSize = wxMin(CXMENUCHECK - MARGIN, GetSize().y);
+ rectCheck.top = rect.top + (rect.bottom - rect.top - checkSize) / 2;
+ rectCheck.bottom = rectCheck.top + checkSize;
const bool isRightAligned = HasFlag(wxALIGN_RIGHT);
if ( isRightAligned )
{
- rectCheck.right = rect.right;
- rectCheck.left = rectCheck.right - checkSize;
-
- rectLabel.right = rectCheck.left - MARGIN;
+ rectLabel.right = rect.right - CXMENUCHECK;
rectLabel.left = rect.left;
+
+ rectCheck.left = rectLabel.right + ( CXMENUCHECK + MARGIN - checkSize ) / 2;
+ rectCheck.right = rectCheck.left + checkSize;
}
else // normal, left-aligned checkbox
{
- rectCheck.left = rect.left;
+ rectCheck.left = rect.left + ( CXMENUCHECK - MARGIN - checkSize ) / 2;
rectCheck.right = rectCheck.left + checkSize;
- rectLabel.left = rectCheck.right + MARGIN;
+ rectLabel.left = rect.left + CXMENUCHECK;
rectLabel.right = rect.right;
}
- // show we draw a focus rect?
+ // shall we draw a focus rect?
const bool isFocused = m_isPressed || FindFocus() == this;
break;
default:
- wxFAIL_MSG( _T("unexpected Get3StateValue() return value") );
+ wxFAIL_MSG( wxT("unexpected Get3StateValue() return value") );
// fall through
case wxCHK_UNCHECKED:
// around it
if ( isFocused )
{
- if ( !::DrawText(hdc, label.wx_str(), label.length(), &rectLabel,
+ RECT oldLabelRect = rectLabel; // needed if right aligned
+
+ if ( !::DrawText(hdc, label.t_str(), label.length(), &rectLabel,
fmt | DT_CALCRECT) )
{
- wxLogLastError(_T("DrawText(DT_CALCRECT)"));
+ wxLogLastError(wxT("DrawText(DT_CALCRECT)"));
+ }
+
+ if ( isRightAligned )
+ {
+ // move the label rect to the right
+ const int labelWidth = rectLabel.right - rectLabel.left;
+ rectLabel.right = oldLabelRect.right;
+ rectLabel.left = rectLabel.right - labelWidth;
}
}
::SetTextColor(hdc, ::GetSysColor(COLOR_GRAYTEXT));
}
- if ( !::DrawText(hdc, label.wx_str(), label.length(), &rectLabel, fmt) )
+ if ( !::DrawText(hdc, label.t_str(), label.length(), &rectLabel, fmt) )
{
- wxLogLastError(_T("DrawText()"));
+ wxLogLastError(wxT("DrawText()"));
}
// finally draw the focus
rectLabel.right++;
if ( !::DrawFocusRect(hdc, &rectLabel) )
{
- wxLogLastError(_T("DrawFocusRect()"));
+ wxLogLastError(wxT("DrawFocusRect()"));
}
}
projects / wxWidgets.git / blobdiff