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

Make wxToolBar styles consistent and add wxTB_DEFAULT_STYLE.

Browse Source 
Don't include wxBORDER_NONE in neither wxToolBar ctor and Create() nor
wxFrame::CreateToolBar() flags parameter, override GetDefaultBorder() in
wxToolBar itself instead to use the border style appropriate for the current
platform by default. This has the same effect -- the default border style is
used unless another one is explicitly specified -- but is more clear and
consistent.

Also add wxTB_DEFAULT_STYLE for consistency with the other classes.

Closes #15037.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-03-31 01:12:27 +00:00
parent 00a399c062
commit f75b1bd31c
12 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,9 @@ public:
// --------------------------
protected:
// choose the default border for this window
virtual wxBorder GetDefaultBorder() const { return wxBORDER_DEFAULT; }
virtual wxSize DoGetBestSize() const;
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

3
include/wx/gtk1/toolbar.h
View File

@@ -68,6 +68,9 @@ protected:
// common part of all ctors
void Init();
// choose the default border for this window
virtual wxBorder GetDefaultBorder() const { return wxBORDER_DEFAULT; }
// set the GTK toolbar style and orientation
void GtkSetStyle();

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

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

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

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

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

@@ -29,7 +29,7 @@ public:
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL,
long style = wxTB_HORIZONTAL,
const wxString& name = wxToolBarNameStr)
{
Create(parent, id, pos, size, style, name);
@@ -39,7 +39,7 @@ public:
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL,
long style = wxTB_HORIZONTAL,
const wxString& name = wxToolBarNameStr);
// override/implement base class virtuals
@@ -88,7 +88,7 @@ public:
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL,
long style = wxTB_HORIZONTAL,
const wxString& name = wxToolBarNameStr,
wxMenuBar* menuBar = NULL)
{
@@ -101,7 +101,7 @@ public:
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL,
long style = wxTB_HORIZONTAL,
const wxString& name = wxToolBarNameStr,
wxMenuBar* menuBar = NULL);

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

@@ -35,7 +35,7 @@ public:
,wxWindowID vId
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,long lStyle = wxNO_BORDER | wxTB_HORIZONTAL
,long lStyle = wxTB_HORIZONTAL
,const wxString& rName = wxToolBarNameStr
) : m_vToolTimer(this, ID_TOOLTIMER)
, m_vToolExpTimer(this, ID_TOOLEXPTIMER)
@@ -55,7 +55,7 @@ public:
,wxWindowID vId
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,long lStyle = wxNO_BORDER | wxTB_HORIZONTAL
,long lStyle = wxTB_HORIZONTAL
,const wxString& rName = wxToolBarNameStr
);

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

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

3
include/wx/tbarbase.h
View File

@@ -609,6 +609,9 @@ public:
#endif
protected:
// choose the default border for this window
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
// to implement in derived classes
// -------------------------------

4
include/wx/toolbar.h
View File

@@ -60,7 +60,9 @@ enum
wxTB_BOTTOM = 0x2000,
// lay out toolbar at the right edge of the window
wxTB_RIGHT = 0x4000
wxTB_RIGHT = 0x4000,
wxTB_DEFAULT_STYLE = wxTB_HORIZONTAL | wxTB_FLAT
};
#if wxUSE_TOOLBAR