From 93212feea0253b0216a72b0f0045a98bbb73f98f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 25 Jul 2004 12:27:23 +0000 Subject: [PATCH] use BS_RIGHT for right-aligned controls (patch 945460) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/checkbox.cpp | 10 +++++----- src/msw/radiobut.cpp | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp index fe6b025067..f0f19718b0 100644 --- a/src/msw/checkbox.cpp +++ b/src/msw/checkbox.cpp @@ -91,11 +91,11 @@ wxEND_FLAGS( wxCheckBoxStyle ) IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckBox, wxControl,"wx/checkbox.h") wxBEGIN_PROPERTIES_TABLE(wxCheckBox) - wxEVENT_PROPERTY( Click , wxEVT_COMMAND_CHECKBOX_CLICKED , wxCommandEvent ) + 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( 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() @@ -159,7 +159,7 @@ bool wxCheckBox::Create(wxWindow *parent, if ( style & wxALIGN_RIGHT ) { - msStyle |= BS_LEFTTEXT; + msStyle |= BS_LEFTTEXT | BS_RIGHT; } return MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, 0); diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp index 2d0a0e4f61..c596f07af5 100644 --- a/src/msw/radiobut.cpp +++ b/src/msw/radiobut.cpp @@ -138,6 +138,8 @@ bool wxRadioButton::Create(wxWindow *parent, if ( HasFlag(wxCLIP_SIBLINGS) ) msStyle |= WS_CLIPSIBLINGS; + if ( HasFlag(wxALIGN_RIGHT) ) + msStyle |= BS_LEFTTEXT | BS_RIGHT; if ( !MSWCreateControl(_T("BUTTON"), msStyle, pos, size, label, 0) ) return false; -- 2.47.2