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

No leading space in toolbars for GTK 2.0 since they

Browse Source 
are drawn as lines.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-10-01 09:24:37 +00:00
parent 58b5a13da5
commit 4ffb82ac32
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/tbargtk.cpp
View File

@@ -278,6 +278,10 @@ bool wxToolBar::Create( wxWindow *parent,
#ifdef __WXGTK20__ #ifdef __WXGTK20__
m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() ); m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
GtkSetStyle(); GtkSetStyle();
// Doesn't work this way.
// GtkToolbarSpaceStyle space_style = GTK_TOOLBAR_SPACE_EMPTY;
// gtk_widget_style_set (GTK_WIDGET (m_toolbar), "space_style", &space_style, NULL);
#else #else
GtkOrientation orient; GtkOrientation orient;
GtkToolbarStyle gtkStyle; GtkToolbarStyle gtkStyle;
@@ -374,9 +378,13 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
{ {
wxToolBarTool *tool = (wxToolBarTool *)toolBase; wxToolBarTool *tool = (wxToolBarTool *)toolBase;
#ifndef __WXGTK20__
// if we have inserted a space before all the tools we must change the GTK // if we have inserted a space before all the tools we must change the GTK
// index by 1 // index by 1
size_t posGtk = m_xMargin > 1 ? pos + 1 : pos; size_t posGtk = m_xMargin > 1 ? pos + 1 : pos;
#else
size_t posGtk = pos;
#endif
if ( tool->IsButton() ) if ( tool->IsButton() )
{ {
@@ -590,8 +598,10 @@ void wxToolBar::SetMargins( int x, int y )
wxCHECK_RET( GetToolsCount() == 0, wxCHECK_RET( GetToolsCount() == 0,
wxT("wxToolBar::SetMargins must be called before adding tools.") ); wxT("wxToolBar::SetMargins must be called before adding tools.") );
#ifndef __WXGTK20__
if (x > 1) if (x > 1)
gtk_toolbar_append_space( m_toolbar ); // oh well gtk_toolbar_append_space( m_toolbar ); // oh well
#endif
m_xMargin = x; m_xMargin = x;
m_yMargin = y; m_yMargin = y;

10
src/gtk1/tbargtk.cpp
View File

@@ -278,6 +278,10 @@ bool wxToolBar::Create( wxWindow *parent,
#ifdef __WXGTK20__ #ifdef __WXGTK20__
m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() ); m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
GtkSetStyle(); GtkSetStyle();
// Doesn't work this way.
// GtkToolbarSpaceStyle space_style = GTK_TOOLBAR_SPACE_EMPTY;
// gtk_widget_style_set (GTK_WIDGET (m_toolbar), "space_style", &space_style, NULL);
#else #else
GtkOrientation orient; GtkOrientation orient;
GtkToolbarStyle gtkStyle; GtkToolbarStyle gtkStyle;
@@ -374,9 +378,13 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
{ {
wxToolBarTool *tool = (wxToolBarTool *)toolBase; wxToolBarTool *tool = (wxToolBarTool *)toolBase;
#ifndef __WXGTK20__
// if we have inserted a space before all the tools we must change the GTK // if we have inserted a space before all the tools we must change the GTK
// index by 1 // index by 1
size_t posGtk = m_xMargin > 1 ? pos + 1 : pos; size_t posGtk = m_xMargin > 1 ? pos + 1 : pos;
#else
size_t posGtk = pos;
#endif
if ( tool->IsButton() ) if ( tool->IsButton() )
{ {
@@ -590,8 +598,10 @@ void wxToolBar::SetMargins( int x, int y )
wxCHECK_RET( GetToolsCount() == 0, wxCHECK_RET( GetToolsCount() == 0,
wxT("wxToolBar::SetMargins must be called before adding tools.") ); wxT("wxToolBar::SetMargins must be called before adding tools.") );
#ifndef __WXGTK20__
if (x > 1) if (x > 1)
gtk_toolbar_append_space( m_toolbar ); // oh well gtk_toolbar_append_space( m_toolbar ); // oh well
#endif
m_xMargin = x; m_xMargin = x;
m_yMargin = y; m_yMargin = y;