/////////////////////////////////////////////////////////////////////////////
-// Name: tbargtk.cpp
+// Name: src/gtk/tbargtk.cpp
// Purpose: GTK toolbar
// Author: Robert Roebling
// Modified: 13.12.99 by VZ to derive from wxToolBarBase
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#if wxUSE_TOOLBAR_NATIVE
+
#include "wx/toolbar.h"
-#if wxUSE_TOOLBAR_NATIVE
+#ifndef WX_PRECOMP
+ #include "wx/frame.h"
+#endif
-#include "wx/frame.h"
+// FIXME: Use GtkImage instead of GtkPixmap. Use the new toolbar API for when gtk runtime is new enough?
+// Beware that the new and old toolbar API may not be mixed in usage.
+#include <gtk/gtkversion.h>
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif
-#include <glib.h>
#include "wx/gtk/private.h"
// ----------------------------------------------------------------------------
// globals
// ----------------------------------------------------------------------------
-// idle system
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
// data
extern bool g_blockEventsOnDrag;
extern wxCursor g_globalCursor;
}
}
- void SetPixmap(const wxBitmap& bitmap)
+ void SetImage(const wxBitmap& bitmap)
{
if (bitmap.Ok())
{
- GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
- : (GdkBitmap *)NULL;
- if (bitmap.HasPixbuf())
- gtk_image_set_from_pixbuf( GTK_IMAGE(m_pixmap), bitmap.GetPixbuf() );
- else
- gtk_pixmap_set( GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask );
+ // setting from pixmap doesn't seem to work right, but pixbuf works well
+ gtk_image_set_from_pixbuf((GtkImage*)m_image, bitmap.GetPixbuf());
}
}
GtkWidget *m_item;
- GtkWidget *m_pixmap;
+ GtkWidget *m_image;
protected:
void Init();
{
tool->Toggle();
- tool->SetPixmap(tool->GetBitmap());
+ tool->SetImage(tool->GetBitmap());
if ( tool->IsRadio() && !tool->IsToggled() )
{
// revert back
tool->Toggle();
- tool->SetPixmap(tool->GetBitmap());
+ tool->SetImage(tool->GetBitmap());
}
}
}
GdkEventCrossing *gdk_event,
wxToolBarTool *tool )
{
- if (g_isIdle) wxapp_install_idle_handler();
+ // don't need to install idle handler, its done from "event" signal
if (g_blockEventsOnDrag) return TRUE;
void wxToolBarTool::Init()
{
m_item =
- m_pixmap = (GtkWidget *)NULL;
+ m_image = NULL;
}
wxToolBarToolBase *wxToolBar::CreateTool(int id,
gtk_widget_show(GTK_WIDGET(m_toolbar));
}
- gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
-
// FIXME: there is no such function for toolbars in 2.0
#if 0
if (style & wxTB_FLAT)
return true;
}
+GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& windows) const
+{
+ return GTK_WIDGET(m_toolbar)->window;
+}
+
void wxToolBar::GtkSetStyle()
{
GtkOrientation orient;
gtk_toolbar_set_orientation(m_toolbar, orient);
gtk_toolbar_set_style(m_toolbar, style);
+ gtk_toolbar_set_tooltips(m_toolbar, !(style & wxTB_NO_TOOLTIPS));
}
void wxToolBar::SetWindowStyleFlag( long style )
bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
{
- wxToolBarTool *tool = (wxToolBarTool *)toolBase;
-
- size_t posGtk = pos;
+ wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
if ( tool->IsButton() )
{
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_image = gtk_image_new();
+ tool->SetImage(bitmap);
-
- if (bitmap.HasPixbuf())
- {
- tool_pixmap = gtk_image_new();
- tool->m_pixmap = tool_pixmap;
- tool->SetPixmap(bitmap);
- }
- else
- {
- 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;
+ gtk_misc_set_alignment((GtkMisc*)tool->m_image, 0.5, 0.5);
}
}
+ const int posGtk = int(pos);
+
switch ( tool->GetStyle() )
{
case wxTOOL_STYLE_BUTTON:
? NULL
: (const char*) wxGTK_CONV( tool->GetShortHelp() ),
"", // tooltip_private_text (?)
- tool->m_pixmap,
+ tool->m_image,
(GtkSignalFunc)gtk_toolbar_callback,
(gpointer)tool,
posGtk
);
- if ( !tool->m_item )
- {
- wxFAIL_MSG( _T("gtk_toolbar_insert_element() failed") );
-
- return false;
- }
+ wxCHECK_MSG(tool->m_item != NULL, false, _T("gtk_toolbar_insert_element() failed"));
- gtk_signal_connect( GTK_OBJECT(tool->m_item),
- "enter_notify_event",
- GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback),
- (gpointer)tool );
- gtk_signal_connect( GTK_OBJECT(tool->m_item),
- "leave_notify_event",
- GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback),
- (gpointer)tool );
+ g_signal_connect (tool->m_item, "enter_notify_event",
+ G_CALLBACK (gtk_toolbar_tool_callback),
+ tool);
+ g_signal_connect (tool->m_item, "leave_notify_event",
+ G_CALLBACK (gtk_toolbar_tool_callback),
+ tool);
}
break;
bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
{
- wxToolBarTool *tool = (wxToolBarTool *)toolBase;
+ wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
switch ( tool->GetStyle() )
{
void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
{
- wxToolBarTool *tool = (wxToolBarTool *)toolBase;
+ wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
if (tool->m_item)
{
void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
{
- wxToolBarTool *tool = (wxToolBarTool *)toolBase;
+ wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
GtkWidget *item = tool->m_item;
if ( item && GTK_IS_TOGGLE_BUTTON(item) )
{
- tool->SetPixmap(tool->GetBitmap());
+ tool->SetImage(tool->GetBitmap());
m_blockEvent = true;
- gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(item), toggle );
m_blockEvent = false;
}
void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
{
- wxToolBarTool *tool = (wxToolBarTool *)FindById(id);
+ wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
if ( tool )
{
void wxToolBar::OnInternalIdle()
{
+ // Check if we have to show window now
+ if (GtkShowFromOnIdle()) return;
+
wxCursor cursor = m_cursor;
if (g_globalCursor.Ok()) cursor = g_globalCursor;
projects / wxWidgets.git / blobdiff