X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c41a418df66b66711eba536526a3085f690782e..6b3eb77aece0708b6c9dd0c58bd2b4408e4fac9d:/src/gtk/tbargtk.cpp diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 7f7d9cbc8b..16a897245a 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -18,6 +18,13 @@ #include "gdk/gdk.h" #include "gtk/gtk.h" +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -30,6 +37,8 @@ extern bool g_blockEventsOnDrag; static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool ) { + if (g_isIdle) wxapp_install_idle_handler(); + if (g_blockEventsOnDrag) return; if (!tool->m_enabled) return; @@ -45,6 +54,8 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *to static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), GdkEventCrossing *WXUNUSED(gdk_event), wxToolBarTool *tool ) { + if (g_isIdle) wxapp_install_idle_handler(); + if (g_blockEventsOnDrag) return TRUE; /* we grey-out the tip text of disabled tool */ @@ -54,24 +65,45 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), if (tool->m_enabled) { if (tb->m_fg->red != 0) - { + { tb->m_fg->red = 0; tb->m_fg->green = 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 { if (tb->m_fg->red == 0) - { + { tb->m_fg->red = 33000; 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 + } } /* emit the event */ @@ -87,6 +119,10 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl) +BEGIN_EVENT_TABLE(wxToolBar, wxControl) + EVT_IDLE(wxToolBar::OnIdle) +END_EVENT_TABLE() + wxToolBar::wxToolBar() { } @@ -124,15 +160,25 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, if (style & wxTB_DOCKABLE) { m_widget = gtk_handle_box_new(); - gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) ); - gtk_widget_show( GTK_WIDGET(m_toolbar) ); + gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) ); + gtk_widget_show( GTK_WIDGET(m_toolbar) ); + +#if (GTK_MINOR_VERSION > 0) + if (style & wxTB_FLAT) + gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(m_widget), GTK_SHADOW_NONE ); +#endif } else { m_widget = GTK_WIDGET(m_toolbar); } - + gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE ); + +#if (GTK_MINOR_VERSION > 0) + if (style & wxTB_FLAT) + gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE ); +#endif m_fg = new GdkColor; m_fg->red = 0; @@ -146,14 +192,24 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, m_bg->blue = 50000; gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_bg ); +#if (GTK_MINOR_VERSION > 0) + gtk_tooltips_force_window( GTK_TOOLBAR(m_toolbar)->tooltips ); + + GtkStyle *g_style = + gtk_style_copy( + gtk_widget_get_style( + GTK_TOOLBAR(m_toolbar)->tooltips->tip_window ) ); + + g_style->bg[GTK_STATE_NORMAL] = *m_bg; + gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style ); +#else gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, m_bg, m_fg ); +#endif m_xMargin = 0; m_yMargin = 0; - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); PostCreation(); @@ -200,13 +256,13 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, m_hasToolAlready = TRUE; wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL, - "invalid bitmap for wxToolBar icon" ); + _T("invalid bitmap for wxToolBar icon") ); wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL, - "wxToolBar doesn't support GdkBitmap" ); + _T("wxToolBar doesn't support GdkBitmap") ); wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL, - "wxToolBar::Add needs a wxBitmap" ); + _T("wxToolBar::Add needs a wxBitmap") ); GtkWidget *tool_pixmap = (GtkWidget *)NULL; @@ -223,7 +279,7 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, toggle, clientData, helpString1, helpString2, - tool_pixmap ); + tool_pixmap ); GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON : GTK_TOOLBAR_CHILD_BUTTON; @@ -234,7 +290,7 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, ctype, (GtkWidget *)NULL, (const char *)NULL, - helpString1, + helpString1.mbc_str(), "", tool_pixmap, (GtkSignalFunc)gtk_toolbar_callback, @@ -260,7 +316,7 @@ void wxToolBar::AddSeparator() void wxToolBar::ClearTools() { - wxFAIL_MSG( "wxToolBar::ClearTools not implemented" ); + wxFAIL_MSG( _T("wxToolBar::ClearTools not implemented") ); } bool wxToolBar::Realize() @@ -297,20 +353,20 @@ void wxToolBar::EnableTool(int toolIndex, bool enable) if (tool->m_index == toolIndex) { 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 (tool->m_item) - gtk_widget_set_sensitive( tool->m_item, enable ); + if (tool->m_item) + gtk_widget_set_sensitive( tool->m_item, enable ); */ - + return; } node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); } void wxToolBar::ToggleTool( int toolIndex, bool toggle ) @@ -329,7 +385,7 @@ void wxToolBar::ToggleTool( int toolIndex, bool toggle ) node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); } wxObject *wxToolBar::GetToolClientData( int index ) const @@ -342,7 +398,7 @@ wxObject *wxToolBar::GetToolClientData( int index ) const node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); return (wxObject*)NULL; } @@ -357,7 +413,7 @@ bool wxToolBar::GetToolState(int toolIndex) const node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); return FALSE; } @@ -372,14 +428,14 @@ bool wxToolBar::GetToolEnabled(int toolIndex) const node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); return FALSE; } void wxToolBar::SetMargins( int x, int y ) { - wxCHECK_RET( !m_hasToolAlready, "wxToolBar::SetMargins must be called before adding tool." ); + wxCHECK_RET( !m_hasToolAlready, _T("wxToolBar::SetMargins must be called before adding tool.") ); if (x > 2) gtk_toolbar_append_space( m_toolbar ); // oh well @@ -389,7 +445,7 @@ void wxToolBar::SetMargins( int x, int y ) void wxToolBar::SetToolPacking( int WXUNUSED(packing) ) { - wxFAIL_MSG( "wxToolBar::SetToolPacking not implemented" ); + wxFAIL_MSG( _T("wxToolBar::SetToolPacking not implemented") ); } void wxToolBar::SetToolSeparation( int separation ) @@ -421,9 +477,9 @@ wxString wxToolBar::GetToolLongHelp(int toolIndex) node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); - return ""; + return _T(""); } wxString wxToolBar::GetToolShortHelp(int toolIndex) @@ -439,9 +495,9 @@ wxString wxToolBar::GetToolShortHelp(int toolIndex) node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); - return ""; + return _T(""); } void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString) @@ -453,12 +509,12 @@ void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString) if (tool->m_index == toolIndex) { tool->m_longHelpString = helpString; - return; + return; } node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); return; } @@ -472,14 +528,41 @@ void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString) if (tool->m_index == toolIndex) { tool->m_shortHelpString = helpString; - return; + return; } node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); return; } +void wxToolBar::OnIdle( wxIdleEvent &WXUNUSED(ievent) ) +{ + wxEvtHandler* evtHandler = GetEventHandler(); + + wxNode* node = m_tools.First(); + while (node) + { + wxToolBarTool* tool = (wxToolBarTool*) node->Data(); + + wxUpdateUIEvent event( tool->m_index ); + event.SetEventObject(this); + + if (evtHandler->ProcessEvent( event )) + { + if (event.GetSetEnabled()) + EnableTool(tool->m_index, event.GetEnabled()); + if (event.GetSetChecked()) + ToggleTool(tool->m_index, event.GetChecked()); +/* + if (event.GetSetText()) + // Set tooltip? +*/ + } + + node = node->Next(); + } +}