AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'mac-def-bmpbtn-margins'

Browse Source 
Stop using wxBU_AUTODRAW under Mac and everywhere else.

See https://github.com/wxWidgets/wxWidgets/pull/859

Closes #18170.
This commit is contained in:
Vadim Zeitlin 2018-07-24 15:17:32 +02:00
commit 4e7b21cd72
15 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

@ -47,6 +47,10 @@ Changes in behaviour not resulting in compilation errors
event handlers if you want the standard key combinations such as Alt-Space or
Alt-F4 to work.
- wxOSX port uses default button margins for wxBitmapButton by default, for
consistency with the other ports. You now need to call SetMargins(0, 0)
explicitly if you really don't want to have any margins in your buttons.
Changes in behaviour which may result in build errors
-----------------------------------------------------

2
include/wx/anybutton.h
View File

@ -25,7 +25,7 @@
#define wxBU_BOTTOM 0x0200
#define wxBU_ALIGN_MASK ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM )
// These two flags are obsolete
// These two flags are obsolete and have no effect any longer.
#define wxBU_NOAUTODRAW 0x0000
#define wxBU_AUTODRAW 0x0004

4
include/wx/cshelp.h
View File

@ -73,7 +73,7 @@ public:
wxWindowID id = wxID_CONTEXT_HELP,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW)
long style = 0)
{
Create(parent, id, pos, size, style);
}
@ -83,7 +83,7 @@ public:
wxWindowID id = wxID_CONTEXT_HELP,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW);
long style = 0);
void OnContextHelp(wxCommandEvent& event);

4
include/wx/gtk1/bmpbuttn.h
View File

@ -24,7 +24,7 @@ public:
const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr)
{
@ -38,7 +38,7 @@ public:
const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr);

4
include/wx/motif/bmpbuttn.h
View File

@ -22,7 +22,7 @@ public:
virtual ~wxBitmapButton();
wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr)
{
@ -31,7 +31,7 @@ public:
bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr);

4
include/wx/msw/bmpbuttn.h
View File

@ -25,7 +25,7 @@ public:
const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr)
{
@ -37,7 +37,7 @@ public:
const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr);

5
include/wx/osx/bmpbuttn.h
View File

@ -20,12 +20,11 @@ class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
public:
wxBitmapButton()
{
SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN);
}
wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr)
{
@ -34,7 +33,7 @@ public:
bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr);

2
interface/wx/anybutton.h
View File

@ -13,7 +13,7 @@
#define wxBU_EXACTFIT 0x0001
#define wxBU_NOTEXT 0x0002
#define wxBU_AUTODRAW 0x0004
#define wxBU_AUTODRAW 0x0004 ///< Obsolete, has no effect.
/**

4
interface/wx/bmpbuttn.h
View File

@ -83,7 +83,7 @@ public:
const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr);
@ -95,7 +95,7 @@ public:
const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr);

2
interface/wx/cshelp.h
View File

@ -271,7 +271,7 @@ public:
wxWindowID id = wxID_CONTEXT_HELP,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW);
long style = 0);
};

2
src/generic/buttonbar.cpp
View File

@ -389,7 +389,7 @@ void wxButtonToolBar::DoLayout()
if (!tool->GetButton())
{
wxBitmapButton* bmpButton = new wxBitmapButton(this, tool->GetId(), tool->GetNormalBitmap(), wxPoint(tool->m_x, tool->m_y), wxDefaultSize,
wxBU_AUTODRAW|wxBORDER_NONE);
wxBORDER_NONE);
if (!tool->GetShortHelp().empty())
bmpButton->SetLabel(tool->GetShortHelp());

2
src/generic/clrpickerg.cpp
View File

@ -50,7 +50,7 @@ bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id,
// create this button
if (!wxBitmapButton::Create( parent, id, m_bitmap, pos,
size, style | wxBU_AUTODRAW, validator, name ))
size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxGenericColourButton creation failed") );
return false;

12
src/osx/bmpbuttn_osx.cpp
View File

@ -38,16 +38,8 @@ bool wxBitmapButton::Create( wxWindow *parent,
validator, name) )
return false;
if ( style & wxBU_AUTODRAW )
{
m_marginX =
m_marginY = wxDEFAULT_BUTTON_MARGIN;
}
else
{
m_marginX =
m_marginY = 0;
}
m_marginX =
m_marginY = wxDEFAULT_BUTTON_MARGIN;
m_bitmaps[State_Normal] = bitmap;

2
src/xrc/xh_bmpbt.cpp
View File

@ -44,7 +44,7 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
GetID(),
GetBitmap(wxT("bitmap"), wxART_BUTTON),
GetPosition(), GetSize(),
GetStyle(wxT("style"), wxBU_AUTODRAW),
GetStyle(wxT("style")),
wxDefaultValidator,
GetName());
if (GetBool(wxT("default"), 0))

2
utils/screenshotgen/src/guiframe.cpp
View File

@ -148,7 +148,7 @@ void GUIFrame::AddPanel_1()
m_radioBtn2->SetToolTip( _("wxRadioButton") );
fgSizer1->Add( m_radioBtn2, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 );
m_bpButton1 = new wxBitmapButton( m_panel1, wxID_ANY, wxBitmap( wxT("bitmaps/wxwin32x32.png"), wxBITMAP_TYPE_ANY ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
m_bpButton1 = new wxBitmapButton( m_panel1, wxID_ANY, wxBitmap( wxT("bitmaps/wxwin32x32.png"), wxBITMAP_TYPE_ANY ), wxDefaultPosition, wxDefaultSize, 0 );
m_bpButton1->SetToolTip( _("wxBitmapButton") );
m_bpButton1->SetToolTip( _("wxBitmapButton") );
fgSizer1->Add( m_bpButton1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 );