Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Use wxTB_DEFAULT_STYLE as default value for wxToolBar style.

Browse Source 
No real changes, but this is more consistent with the other controls.

It also highlights the ports which use non-default style, e.g. wxQt where
wxNO_BORDER should probably not be used as part of default toolbar style but
rather added in the ctor implementation.

Closes #16667.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-11-07 14:59:33 +00:00
parent 50354a2540
commit 44bb92ecd5
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/toolbar.h
View File

@@ -24,7 +24,7 @@ public:
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr ) const wxString& name = wxToolBarNameStr )
{ {
Init(); Init();
@@ -36,7 +36,7 @@ public:
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr ); const wxString& name = wxToolBarNameStr );
virtual ~wxToolBar(); virtual ~wxToolBar();

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

@@ -21,7 +21,7 @@ public:
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr) const wxString& name = wxToolBarNameStr)
{ {
Init(); Init();
@@ -33,7 +33,7 @@ public:
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr); const wxString& name = wxToolBarNameStr);
virtual ~wxToolBar(); virtual ~wxToolBar();

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

@@ -26,7 +26,7 @@ public:
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr) const wxString& name = wxToolBarNameStr)
{ {
Init(); Init();
@@ -38,7 +38,7 @@ public:
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr); const wxString& name = wxToolBarNameStr);
virtual ~wxToolBar(); virtual ~wxToolBar();

8
include/wx/msw/wince/tbarwce.h
View File

@@ -28,7 +28,7 @@ public:
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr) const wxString& name = wxToolBarNameStr)
{ {
Create(parent, id, pos, size, style, name); Create(parent, id, pos, size, style, name);
@@ -38,7 +38,7 @@ public:
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr); const wxString& name = wxToolBarNameStr);
// override/implement base class virtuals // override/implement base class virtuals
@@ -87,7 +87,7 @@ public:
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr, const wxString& name = wxToolBarNameStr,
wxMenuBar* menuBar = NULL) wxMenuBar* menuBar = NULL)
{ {
@@ -100,7 +100,7 @@ public:
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr, const wxString& name = wxToolBarNameStr,
wxMenuBar* menuBar = NULL); wxMenuBar* menuBar = NULL);

4
include/wx/osx/toolbar.h
View File

@@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
inline wxToolBar(wxWindow *parent, wxWindowID id, inline wxToolBar(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr) const wxString& name = wxToolBarNameStr)
{ {
Init(); Init();
@@ -37,7 +37,7 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
virtual ~wxToolBar(); virtual ~wxToolBar();
bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr); const wxString& name = wxToolBarNameStr);
virtual void SetWindowStyleFlag(long style); virtual void SetWindowStyleFlag(long style);

4
include/wx/qt/toolbar.h
View File

@@ -21,7 +21,7 @@ public:
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE | wxNO_BORDER,
const wxString& name = wxToolBarNameStr) const wxString& name = wxToolBarNameStr)
{ {
Init(); Init();
@@ -36,7 +36,7 @@ public:
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL, long style = wxTB_DEFAULT_STYLE | wxNO_BORDER,
const wxString& name = wxToolBarNameStr); const wxString& name = wxToolBarNameStr);
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;