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();
// "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;
}
#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;
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 );
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;
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;
+#ifndef __WXGTK20__
SET_STYLE_FONT(g_style, GtkGetDefaultGuiFont());
+#endif
gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
{
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();
+
+ 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;
- tool->m_pixmap = tool_pixmap;
+ 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() )
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 )
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;
tool->GetControl()->m_widget,
(const char *) NULL,
(const char *) NULL,
- pos
+ posGtk
);
break;
}
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;
m_blockEvent = TRUE;
gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle );
-
+
m_blockEvent = FALSE;
}
}
{
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;
}
{
(void)tool->SetShortHelp(helpString);
gtk_tooltips_set_tip(m_toolbar->tooltips, tool->m_item,
- helpString.mbc_str(), "");
+ wxGTK_CONV( helpString ), "");
}
}
projects / wxWidgets.git / blobdiff