From 4ffb82ac32b8a3329891f9f2f40a57c2a2c19e27 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 1 Oct 2002 09:24:37 +0000 Subject: [PATCH] No leading space in toolbars for GTK 2.0 since they 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 --- src/gtk/tbargtk.cpp | 10 ++++++++++ src/gtk/textctrl.cpp | 2 +- src/gtk1/tbargtk.cpp | 10 ++++++++++ src/gtk1/textctrl.cpp | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index fe543054f9..704086c960 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -278,6 +278,10 @@ bool wxToolBar::Create( wxWindow *parent, #ifdef __WXGTK20__ m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() ); 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 GtkOrientation orient; GtkToolbarStyle gtkStyle; @@ -374,9 +378,13 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) { wxToolBarTool *tool = (wxToolBarTool *)toolBase; +#ifndef __WXGTK20__ // if we have inserted a space before all the tools we must change the GTK // index by 1 size_t posGtk = m_xMargin > 1 ? pos + 1 : pos; +#else + size_t posGtk = pos; +#endif if ( tool->IsButton() ) { @@ -590,8 +598,10 @@ void wxToolBar::SetMargins( int x, int y ) wxCHECK_RET( GetToolsCount() == 0, wxT("wxToolBar::SetMargins must be called before adding tools.") ); +#ifndef __WXGTK20__ if (x > 1) gtk_toolbar_append_space( m_toolbar ); // oh well +#endif m_xMargin = x; m_yMargin = y; diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index eec8c86a86..d449dcfb75 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -475,7 +475,7 @@ wxString wxTextCtrl::GetValue() const GtkTextIter end; gtk_text_buffer_get_end_iter( text_buffer, &end ); gchar *text = gtk_text_buffer_get_text( text_buffer, &start, &end, TRUE ); - + #if wxUSE_UNICODE wxWCharBuffer buffer( wxConvUTF8.cMB2WX( text ) ); #else diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp index fe543054f9..704086c960 100644 --- a/src/gtk1/tbargtk.cpp +++ b/src/gtk1/tbargtk.cpp @@ -278,6 +278,10 @@ bool wxToolBar::Create( wxWindow *parent, #ifdef __WXGTK20__ m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() ); 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 GtkOrientation orient; GtkToolbarStyle gtkStyle; @@ -374,9 +378,13 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) { wxToolBarTool *tool = (wxToolBarTool *)toolBase; +#ifndef __WXGTK20__ // if we have inserted a space before all the tools we must change the GTK // index by 1 size_t posGtk = m_xMargin > 1 ? pos + 1 : pos; +#else + size_t posGtk = pos; +#endif if ( tool->IsButton() ) { @@ -590,8 +598,10 @@ void wxToolBar::SetMargins( int x, int y ) wxCHECK_RET( GetToolsCount() == 0, wxT("wxToolBar::SetMargins must be called before adding tools.") ); +#ifndef __WXGTK20__ if (x > 1) gtk_toolbar_append_space( m_toolbar ); // oh well +#endif m_xMargin = x; m_yMargin = y; diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index eec8c86a86..d449dcfb75 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -475,7 +475,7 @@ wxString wxTextCtrl::GetValue() const GtkTextIter end; gtk_text_buffer_get_end_iter( text_buffer, &end ); gchar *text = gtk_text_buffer_get_text( text_buffer, &start, &end, TRUE ); - + #if wxUSE_UNICODE wxWCharBuffer buffer( wxConvUTF8.cMB2WX( text ) ); #else