X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fc6e5fa23909c701654001a895f2ba95751e0af..01feccc2041bc884d6dea186c501a666d9e5e660:/src/gtk/tbargtk.cpp diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 53e68f741a..2ce4bc754c 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -143,18 +143,18 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool ) { - if (g_isIdle) + if (g_isIdle) wxapp_install_idle_handler(); wxToolBar *tbar = (wxToolBar *)tool->GetToolBar(); - + if (tbar->m_blockEvent) return; if (g_blockEventsOnDrag) return; if (!tool->IsEnabled()) return; if (tool->CanBeToggled()) - { + { tool->Toggle(); wxBitmap bitmap = tool->GetBitmap(); @@ -182,22 +182,22 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), // "enter_notify_event" / "leave_notify_event" //----------------------------------------------------------------------------- -static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget), +static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget), GdkEventCrossing *gdk_event, wxToolBarTool *tool ) { if (g_isIdle) wxapp_install_idle_handler(); if (g_blockEventsOnDrag) return TRUE; - + wxToolBar *tb = (wxToolBar *)tool->GetToolBar(); - + // emit the event if( gdk_event->type == GDK_ENTER_NOTIFY ) tb->OnMouseEnter( tool->GetId() ); else tb->OnMouseEnter( -1 ); - + return FALSE; } @@ -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; @@ -298,8 +302,11 @@ bool wxToolBar::Create( wxWindow *parent, gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(m_widget), GTK_SHADOW_NONE ); } else - { - m_widget = GTK_WIDGET(m_toolbar); + { + m_widget = gtk_event_box_new(); + gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) ); + ConnectWidget( m_widget ); + gtk_widget_show(GTK_WIDGET(m_toolbar)); } gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE ); @@ -312,13 +319,13 @@ bool wxToolBar::Create( wxWindow *parent, m_fg = new GdkColor; - m_fg->red = 0; - m_fg->green = 0; + m_fg->red = 0; + m_fg->green = 0; m_fg->blue = 0; wxColour fg(0,0,0); fg.CalcPixel( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ) ); m_fg->pixel = fg.GetPixel(); - + m_bg = new GdkColor; m_bg->red = 65535; m_bg->green = 65535; @@ -326,18 +333,16 @@ bool wxToolBar::Create( wxWindow *parent, wxColour bg(255,255,196); bg.CalcPixel( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ) ); m_bg->pixel = bg.GetPixel(); - + gtk_tooltips_force_window( GTK_TOOLBAR(m_toolbar)->tooltips ); - GtkStyle *g_style = + GtkStyle *g_style = gtk_style_copy( - gtk_widget_get_style( + gtk_widget_get_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window ) ); g_style->bg[GTK_STATE_NORMAL] = *m_bg; - SET_STYLE_FONT(g_style, GtkGetDefaultGuiFont()); - gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style ); m_parent->DoAddChild( this ); @@ -371,36 +376,44 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) { wxToolBarTool *tool = (wxToolBarTool *)toolBase; - // we have inserted a space before all the tools - if (m_xMargin > 1) pos++; - +#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() ) { - wxBitmap bitmap = tool->GetNormalBitmap(); - - wxCHECK_MSG( bitmap.Ok(), FALSE, - wxT("invalid bitmap for wxToolBar icon") ); - - wxCHECK_MSG( bitmap.GetBitmap() == NULL, FALSE, - wxT("wxToolBar doesn't support GdkBitmap") ); - - wxCHECK_MSG( bitmap.GetPixmap() != NULL, FALSE, - wxT("wxToolBar::Add needs a wxBitmap") ); - - GtkWidget *tool_pixmap = (GtkWidget *)NULL; - - GdkPixmap *pixmap = bitmap.GetPixmap(); - - GdkBitmap *mask = (GdkBitmap *)NULL; - if ( bitmap.GetMask() ) - mask = bitmap.GetMask()->GetBitmap(); - - tool_pixmap = gtk_pixmap_new( pixmap, mask ); - gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE ); - - gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); - - tool->m_pixmap = tool_pixmap; + if ( !HasFlag(wxTB_NOICONS) ) + { + wxBitmap bitmap = tool->GetNormalBitmap(); + + wxCHECK_MSG( bitmap.Ok(), FALSE, + wxT("invalid bitmap for wxToolBar icon") ); + + wxCHECK_MSG( bitmap.GetBitmap() == NULL, FALSE, + wxT("wxToolBar doesn't support GdkBitmap") ); + + wxCHECK_MSG( bitmap.GetPixmap() != NULL, FALSE, + wxT("wxToolBar::Add needs a wxBitmap") ); + + GtkWidget *tool_pixmap = (GtkWidget *)NULL; + + GdkPixmap *pixmap = bitmap.GetPixmap(); + + GdkBitmap *mask = (GdkBitmap *)NULL; + if ( bitmap.GetMask() ) + mask = bitmap.GetMask()->GetBitmap(); + + tool_pixmap = gtk_pixmap_new( pixmap, mask ); + gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE ); + + gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); + + tool->m_pixmap = tool_pixmap; + } } switch ( tool->GetStyle() ) @@ -451,7 +464,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) tool->m_pixmap, (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool, - pos + posGtk ); if ( !tool->m_item ) @@ -460,20 +473,20 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) return FALSE; } - + gtk_signal_connect( GTK_OBJECT(tool->m_item), - "enter_notify_event", + "enter_notify_event", GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback), (gpointer)tool ); gtk_signal_connect( GTK_OBJECT(tool->m_item), - "leave_notify_event", + "leave_notify_event", GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback), (gpointer)tool ); } break; case wxTOOL_STYLE_SEPARATOR: - gtk_toolbar_insert_space( m_toolbar, pos ); + gtk_toolbar_insert_space( m_toolbar, posGtk ); // skip the rest return TRUE; @@ -484,7 +497,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) tool->GetControl()->m_widget, (const char *) NULL, (const char *) NULL, - pos + posGtk ); break; } @@ -532,7 +545,7 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable) } } -void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) +void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) { wxToolBarTool *tool = (wxToolBarTool *)toolBase; @@ -553,7 +566,7 @@ void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) m_blockEvent = TRUE; gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle ); - + m_blockEvent = FALSE; } } @@ -582,9 +595,12 @@ void wxToolBar::SetMargins( int x, int y ) { wxCHECK_RET( GetToolsCount() == 0, wxT("wxToolBar::SetMargins must be called before adding tools.") ); - - if (x > 1) gtk_toolbar_append_space( m_toolbar ); // oh well - + +#ifndef __WXGTK20__ + if (x > 1) + gtk_toolbar_append_space( m_toolbar ); // oh well +#endif + m_xMargin = x; m_yMargin = y; }