// data
//-----------------------------------------------------------------------------
-extern bool g_blockEventsOnDrag;
+extern bool g_blockEventsOnDrag;
+extern wxCursor g_globalCursor;
//-----------------------------------------------------------------------------
// "clicked" (internal from gtk_toolbar)
static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
{
- if (g_isIdle) wxapp_install_idle_handler();
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
+ if (tool->m_owner->m_blockNextEvent)
+ {
+ tool->m_owner->m_blockNextEvent = FALSE;
+ return;
+ }
if (g_blockEventsOnDrag) return;
if (!tool->m_enabled) return;
wxToolBar *tb = tool->m_owner;
- /* we grey-out the tip text of disabled tool */
-#if 0
+#if (GTK_MINOR_VERSION == 0)
+ /* we grey-out the tip text of disabled tool in GTK 1.0 */
if (tool->m_enabled)
{
if (tb->m_fg->red != 0)
tb->m_fg->blue = 0;
gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg );
-#if (GTK_MINOR_VERSION > 0)
- GtkStyle *g_style =
- gtk_style_copy(
- gtk_widget_get_style(
- GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window ) );
-
- g_style->fg[GTK_STATE_NORMAL] = *tb->m_fg;
- gtk_widget_set_style( GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window, g_style );
-#else
gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg );
-#endif
}
}
else
tb->m_fg->green = 33000;
tb->m_fg->blue = 33000;
gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg );
-#if (GTK_MINOR_VERSION > 0)
- GtkStyle *g_style =
- gtk_style_copy(
- gtk_widget_get_style(
- GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window ) );
-
- g_style->fg[GTK_STATE_NORMAL] = *tb->m_fg;
- gtk_widget_set_style( GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window, g_style );
-#else
gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg );
-#endif
}
}
#endif
return FALSE;
}
+//-----------------------------------------------------------------------------
+// InsertChild callback for wxToolBar
+//-----------------------------------------------------------------------------
+
+static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), wxWindow* WXUNUSED(child) )
+{
+ /* we don't do anything here but pray */
+}
+
//-----------------------------------------------------------------------------
// wxToolBar
//-----------------------------------------------------------------------------
long style, const wxString& name )
{
m_needParent = TRUE;
+ m_blockNextEvent = FALSE;
+ m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
- PreCreation( parent, id, pos, size, style, name );
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+ {
+ wxFAIL_MSG( wxT("wxToolBar creation failed") );
+ return FALSE;
+ }
m_tools.DeleteContents( TRUE );
wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
const wxBitmap& pushedBitmap, bool toggle,
- float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
+ wxCoord WXUNUSED(xPos), wxCoord WXUNUSED(yPos), wxObject *clientData,
const wxString& helpString1, const wxString& helpString2 )
{
m_hasToolAlready = TRUE;
wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
- _T("invalid bitmap for wxToolBar icon") );
+ wxT("invalid bitmap for wxToolBar icon") );
wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,
- _T("wxToolBar doesn't support GdkBitmap") );
+ wxT("wxToolBar doesn't support GdkBitmap") );
wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,
- _T("wxToolBar::Add needs a wxBitmap") );
+ wxT("wxToolBar::Add needs a wxBitmap") );
GtkWidget *tool_pixmap = (GtkWidget *)NULL;
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 );
GtkWidget *item = gtk_toolbar_append_element
(
- GTK_TOOLBAR(m_toolbar),
+ m_toolbar,
ctype,
(GtkWidget *)NULL,
(const char *)NULL,
tool->m_item = item;
+ GtkRequisition req;
+ (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+ m_width = req.width;
+ m_height = req.height;
+
gtk_signal_connect( GTK_OBJECT(tool->m_item),
"enter_notify_event",
GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback),
return tool;
}
+bool wxToolBar::AddControl(wxControl *control)
+{
+ wxCHECK_MSG( control, FALSE, wxT("toolbar: can't insert NULL control") );
+
+ wxCHECK_MSG( control->GetParent() == this, FALSE,
+ wxT("control must have toolbar as parent") );
+
+ m_hasToolAlready = TRUE;
+
+ wxToolBarTool *tool = new wxToolBarTool(control);
+
+ gtk_toolbar_append_widget( m_toolbar, control->m_widget, (const char *) NULL, (const char *) NULL );
+
+ GtkRequisition req;
+ (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+ m_width = req.width;
+ m_height = req.height;
+
+ m_tools.Append( tool );
+
+ return TRUE;
+}
+
void wxToolBar::AddSeparator()
{
gtk_toolbar_append_space( m_toolbar );
void wxToolBar::ClearTools()
{
- wxFAIL_MSG( _T("wxToolBar::ClearTools not implemented") );
+ wxFAIL_MSG( wxT("wxToolBar::ClearTools not implemented") );
}
bool wxToolBar::Realize()
{
tool->m_enabled = enable;
-/* we don't disable the tools for now as the bitmaps don't get
- greyed anyway and this also disables tooltips */
-
+#if (GTK_MINOR_VERSION > 0)
+ /* 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
return;
}
node = node->Next();
}
- wxFAIL_MSG( _T("wrong toolbar index") );
+ wxFAIL_MSG( wxT("wrong toolbar index") );
}
void wxToolBar::ToggleTool( int toolIndex, bool toggle )
wxToolBarTool *tool = (wxToolBarTool*)node->Data();
if (tool->m_index == toolIndex)
{
- tool->m_toggleState = toggle;
if ((tool->m_item) && (GTK_IS_TOGGLE_BUTTON(tool->m_item)))
+ {
+ tool->m_toggleState = toggle;
+
+ if (tool->m_bitmap2.Ok())
+ {
+ wxBitmap bitmap = tool->m_bitmap1;
+ if (tool->m_toggleState) bitmap = tool->m_bitmap2;
+
+ GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
+
+ GdkBitmap *mask = (GdkBitmap *) NULL;
+ if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
+
+ gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
+ }
+
+ m_blockNextEvent = TRUE; // we cannot use gtk_signal_disconnect here
+
gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(tool->m_item), toggle );
+ }
+
return;
}
node = node->Next();
}
- wxFAIL_MSG( _T("wrong toolbar index") );
+ wxFAIL_MSG( wxT("wrong toolbar index") );
}
wxObject *wxToolBar::GetToolClientData( int index ) const
node = node->Next();
}
- wxFAIL_MSG( _T("wrong toolbar index") );
+ wxFAIL_MSG( wxT("wrong toolbar index") );
return (wxObject*)NULL;
}
node = node->Next();
}
- wxFAIL_MSG( _T("wrong toolbar index") );
+ wxFAIL_MSG( wxT("wrong toolbar index") );
return FALSE;
}
node = node->Next();
}
- wxFAIL_MSG( _T("wrong toolbar index") );
+ wxFAIL_MSG( wxT("wrong toolbar index") );
return FALSE;
}
void wxToolBar::SetMargins( int x, int y )
{
- wxCHECK_RET( !m_hasToolAlready, _T("wxToolBar::SetMargins must be called before adding tool.") );
+ wxCHECK_RET( !m_hasToolAlready, wxT("wxToolBar::SetMargins must be called before adding tool.") );
if (x > 2) gtk_toolbar_append_space( m_toolbar ); // oh well
void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
{
- wxFAIL_MSG( _T("wxToolBar::SetToolPacking not implemented") );
+ wxFAIL_MSG( wxT("wxToolBar::SetToolPacking not implemented") );
}
void wxToolBar::SetToolSeparation( int separation )
node = node->Next();
}
- wxFAIL_MSG( _T("wrong toolbar index") );
+ wxFAIL_MSG( wxT("wrong toolbar index") );
- return _T("");
+ return wxT("");
}
wxString wxToolBar::GetToolShortHelp(int toolIndex)
node = node->Next();
}
- wxFAIL_MSG( _T("wrong toolbar index") );
+ wxFAIL_MSG( wxT("wrong toolbar index") );
- return _T("");
+ return wxT("");
}
void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
node = node->Next();
}
- wxFAIL_MSG( _T("wrong toolbar index") );
+ wxFAIL_MSG( wxT("wrong toolbar index") );
return;
}
node = node->Next();
}
- wxFAIL_MSG( _T("wrong toolbar index") );
+ wxFAIL_MSG( wxT("wrong toolbar index") );
return;
}
}
}
+void wxToolBar::OnInternalIdle()
+{
+ wxCursor cursor = m_cursor;
+ if (g_globalCursor.Ok()) cursor = g_globalCursor;
+
+ if (cursor.Ok())
+ {
+ /* I now set the cursor the anew in every OnInternalIdle call
+ as setting the cursor in a parent window also effects the
+ windows above so that checking for the current cursor is
+ not possible. */
+
+ if (HasFlag(wxTB_DOCKABLE))
+ {
+ /* if the toolbar is dockable, then m_widget stands for the
+ GtkHandleBox widget, which uses its own window so that we
+ can set the cursor for it. if the toolbar is not dockable,
+ m_widget comes from m_toolbar which uses its parent's
+ window ("windowless windows") and thus we cannot set the
+ cursor. */
+ gdk_window_set_cursor( m_widget->window, cursor.GetCursor() );
+ }
+
+ wxNode *node = m_tools.First();
+ while (node)
+ {
+ wxToolBarTool *tool = (wxToolBarTool*)node->Data();
+ node = node->Next();
+
+ if (!tool->m_item || !tool->m_item->window)
+ continue;
+ else
+ gdk_window_set_cursor( tool->m_item->window, cursor.GetCursor() );
+ }
+ }
+
+ UpdateWindowUI();
+}
+
#endif
projects / wxWidgets.git / blobdiff