1. all recently added classes work under Windows
2. scrollbar input handling improved, should be fine now 3. sample gets the theme name from the cmd line git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/wxUNIVERSAL@8193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -44,8 +44,8 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// default margins around the image
|
||||
static const wxCoord DEFAULT_BTN_MARGIN_X = 6;
|
||||
static const wxCoord DEFAULT_BTN_MARGIN_Y = 3;
|
||||
static const wxCoord DEFAULT_BTN_MARGIN_X = 0;
|
||||
static const wxCoord DEFAULT_BTN_MARGIN_Y = 0;
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
@@ -76,18 +76,7 @@ bool wxButton::Create(wxWindow *parent,
|
||||
// center label by default
|
||||
if ( !(style & wxALIGN_MASK) )
|
||||
{
|
||||
style |= wxALIGN_CENTRE_VERTICAL;
|
||||
|
||||
// normally, buttons are centered, but it looks better to put them
|
||||
// near the image for the buttons which have one
|
||||
if ( bitmap.Ok() )
|
||||
{
|
||||
style |= wxALIGN_LEFT;
|
||||
}
|
||||
else
|
||||
{
|
||||
style |= wxALIGN_CENTRE_HORIZONTAL;
|
||||
}
|
||||
style |= wxALIGN_CENTRE_HORIZONTAL | wxALIGN_CENTRE_VERTICAL;
|
||||
}
|
||||
|
||||
if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
|
||||
|
Reference in New Issue
Block a user