X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38762f09cd1d8532aef238ccbf324974fa1d4ba3..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/tbargtk.cpp?ds=inline diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 38a8fde253..496fa62618 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -16,10 +16,13 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "tbargtk.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/toolbar.h" #if wxUSE_TOOLBAR_NATIVE @@ -57,7 +60,13 @@ static void GetGtkStyle(long style, if ( style & wxTB_TEXT ) { - *gtkStyle = style & wxTB_NOICONS ? GTK_TOOLBAR_TEXT : GTK_TOOLBAR_BOTH; + *gtkStyle = style & wxTB_NOICONS + ? GTK_TOOLBAR_TEXT + : ( +#ifdef __WXGTK20__ + style & wxTB_HORZ_LAYOUT ? GTK_TOOLBAR_BOTH_HORIZ : +#endif // __WXGTK20__ + GTK_TOOLBAR_BOTH); } else // no text, hence we must have the icons or what would we show? { @@ -130,7 +139,7 @@ protected: // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) // ============================================================================ // implementation @@ -143,18 +152,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 +191,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 +287,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 +311,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 +328,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 +342,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,38 +385,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 ); -#if (GTK_MINOR_VERSION > 0) - gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE ); -#endif - - gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); + if ( !HasFlag(wxTB_NOICONS) ) + { + wxBitmap bitmap = tool->GetNormalBitmap(); - tool->m_pixmap = tool_pixmap; + 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() ) @@ -416,8 +436,10 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) if ( tool->IsRadio() ) { - wxToolBarToolsList::Node *node = pos ? m_tools.Item(pos - 1) - : NULL; + wxToolBarToolsList::compatibility_iterator node + = wxToolBarToolsList::compatibility_iterator(); + if ( pos ) node = m_tools.Item(pos - 1); + while ( node ) { wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); @@ -445,15 +467,15 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) widget, tool->GetLabel().empty() ? NULL - : tool->GetLabel().mbc_str(), + : (const char*) wxGTK_CONV( tool->GetLabel() ), tool->GetShortHelp().empty() ? NULL - : tool->GetShortHelp().mbc_str(), + : (const char*) wxGTK_CONV( tool->GetShortHelp() ), "", // tooltip_private_text (?) tool->m_pixmap, (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool, - pos + posGtk ); if ( !tool->m_item ) @@ -464,18 +486,18 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) } 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; @@ -486,7 +508,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) tool->GetControl()->m_widget, (const char *) NULL, (const char *) NULL, - pos + posGtk ); break; } @@ -526,17 +548,15 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable) { -#if (GTK_MINOR_VERSION > 0) wxToolBarTool *tool = (wxToolBarTool *)toolBase; - /* we don't disable the tools for GTK 1.0 as the bitmaps don't get - greyed anyway and this also disables tooltips */ if (tool->m_item) + { gtk_widget_set_sensitive( tool->m_item, enable ); -#endif + } } -void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) +void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) { wxToolBarTool *tool = (wxToolBarTool *)toolBase; @@ -557,7 +577,7 @@ void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) m_blockEvent = TRUE; gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle ); - + m_blockEvent = FALSE; } } @@ -586,9 +606,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; } @@ -611,7 +634,7 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) { (void)tool->SetShortHelp(helpString); gtk_tooltips_set_tip(m_toolbar->tooltips, tool->m_item, - helpString.mbc_str(), ""); + wxGTK_CONV( helpString ), ""); } } @@ -642,7 +665,7 @@ void wxToolBar::OnInternalIdle() gdk_window_set_cursor( m_widget->window, cursor.GetCursor() ); } - wxToolBarToolsList::Node *node = m_tools.GetFirst(); + wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); while ( node ) { wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); @@ -661,7 +684,8 @@ void wxToolBar::OnInternalIdle() } } - UpdateWindowUI(); + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } #endif // wxUSE_TOOLBAR_NATIVE