X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b46e869676813430c8fbf0d5828005f1b898d985..d7dbc98ae97946a3d91e6653527fc72276d83712:/src/gtk/tbargtk.cpp diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index be712e3d01..16a897245a 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -12,45 +12,24 @@ #endif #include "wx/toolbar.h" +#include "wx/frame.h" + +#include "glib.h" +#include "gdk/gdk.h" +#include "gtk/gtk.h" //----------------------------------------------------------------------------- -// data +// idle system //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; //----------------------------------------------------------------------------- -// wxToolBarTool +// data //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject) - -wxToolBarTool::wxToolBarTool( wxToolBar *owner, int theIndex, - const wxBitmap& bitmap1, const wxBitmap& bitmap2, - bool toggle, - wxObject *clientData, - const wxString& shortHelpString, - const wxString& longHelpString, - GtkWidget *item ) -{ - m_owner = owner; - m_index = theIndex; - m_bitmap1 = bitmap1; - m_bitmap2 = bitmap2; - m_isToggle = toggle; - m_enabled = TRUE; - m_toggleState = FALSE; - m_shortHelpString = shortHelpString; - m_longHelpString = longHelpString; - m_isMenuCommand = TRUE; - m_clientData = clientData; - m_deleteSecondBitmap = FALSE; - m_item = item; -} - -wxToolBarTool::~wxToolBarTool() -{ -} +extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- // "clicked" (internal from gtk_toolbar) @@ -58,12 +37,14 @@ wxToolBarTool::~wxToolBarTool() static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool ) { - if (g_blockEventsOnDrag) return; - if (!tool->m_enabled) return; + if (g_isIdle) wxapp_install_idle_handler(); + + if (g_blockEventsOnDrag) return; + if (!tool->m_enabled) return; - if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState; + if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState; - tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState ); + tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState ); } //----------------------------------------------------------------------------- @@ -73,11 +54,63 @@ 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_blockEventsOnDrag) return TRUE; + if (g_isIdle) wxapp_install_idle_handler(); + + if (g_blockEventsOnDrag) return TRUE; + + /* we grey-out the tip text of disabled tool */ + + wxToolBar *tb = tool->m_owner; + + 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 */ - tool->m_owner->OnMouseEnter( tool->m_index ); + tb->OnMouseEnter( tool->m_index ); - return FALSE; + return FALSE; } //----------------------------------------------------------------------------- @@ -86,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() { } @@ -94,83 +131,121 @@ wxToolBar::wxToolBar( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) { - Create( parent, id, pos, size, style, name ); + Create( parent, id, pos, size, style, name ); } wxToolBar::~wxToolBar() { + delete m_fg; + delete m_bg; } bool wxToolBar::Create( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) { - m_needParent = TRUE; + m_needParent = TRUE; - PreCreation( parent, id, pos, size, style, name ); + PreCreation( parent, id, pos, size, style, name ); - m_tools.DeleteContents( TRUE ); + m_tools.DeleteContents( TRUE ); - m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL, - GTK_TOOLBAR_ICONS ) ); + m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL, + GTK_TOOLBAR_ICONS ) ); - m_widget = GTK_WIDGET(m_toolbar); - - gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE ); - - m_fg.red = 0; - m_fg.green = 0; - m_fg.blue = 0; - gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), &m_fg ); - - m_bg.red = 65535; - m_bg.green = 65535; - m_bg.blue = 50000; - gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), &m_bg ); - - gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, &m_bg, &m_fg ); + m_separation = 5; + gtk_toolbar_set_space_size( m_toolbar, m_separation ); + m_hasToolAlready = FALSE; + + 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) ); + +#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 - gtk_toolbar_append_space( m_toolbar ); + m_fg = new GdkColor; + m_fg->red = 0; + m_fg->green = 0; + m_fg->blue = 0; + gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_fg ); + + m_bg = new GdkColor; + m_bg->red = 65535; + m_bg->green = 65535; + m_bg->blue = 50000; + gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_bg ); - m_parent->AddChild( this ); +#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_parent->m_insertCallback)( m_parent, this ); + m_xMargin = 0; + m_yMargin = 0; + + m_parent->DoAddChild( this ); - PostCreation(); + PostCreation(); - Show( TRUE ); + Show( TRUE ); - return TRUE; + return TRUE; } bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown ) { - wxCommandEvent event( wxEVT_COMMAND_TOOL_CLICKED, toolIndex ); - event.SetEventObject(this); - event.SetInt( toolIndex ); - event.SetExtraLong((long) toggleDown); + wxCommandEvent event( wxEVT_COMMAND_TOOL_CLICKED, toolIndex ); + event.SetEventObject(this); + event.SetInt( toolIndex ); + event.SetExtraLong((long) toggleDown); - GetEventHandler()->ProcessEvent(event); + GetEventHandler()->ProcessEvent(event); - return TRUE; + return TRUE; } void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y) ) { - wxCommandEvent event( wxEVT_COMMAND_TOOL_RCLICKED, toolIndex ); - event.SetEventObject( this ); - event.SetInt( toolIndex ); + wxCommandEvent event( wxEVT_COMMAND_TOOL_RCLICKED, toolIndex ); + event.SetEventObject( this ); + event.SetInt( toolIndex ); - GetEventHandler()->ProcessEvent(event); + GetEventHandler()->ProcessEvent(event); } void wxToolBar::OnMouseEnter( int toolIndex ) { - wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, GetId() ); - event.SetEventObject(this); - event.SetInt( toolIndex ); + wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, GetId() ); + event.SetEventObject(this); + event.SetInt( toolIndex ); - GetEventHandler()->ProcessEvent(event); + GetEventHandler()->ProcessEvent(event); } wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, @@ -178,23 +253,19 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData, const wxString& helpString1, const wxString& helpString2 ) { - wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL, - "invalid bitmap for wxToolBar icon" ); - - wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, - toggle, clientData, - helpString1, helpString2 ); + m_hasToolAlready = TRUE; + + wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL, + _T("invalid bitmap for wxToolBar icon") ); - wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL, - "wxToolBar doesn't support GdkBitmap" ); + wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL, + _T("wxToolBar doesn't support GdkBitmap") ); - wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL, - "wxToolBar::Add needs a wxBitmap" ); + wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL, + _T("wxToolBar::Add needs a wxBitmap") ); - GtkWidget *tool_pixmap = (GtkWidget *)NULL; + GtkWidget *tool_pixmap = (GtkWidget *)NULL; - if (TRUE) // FIXME huh? - { GdkPixmap *pixmap = bitmap.GetPixmap(); GdkBitmap *mask = (GdkBitmap *)NULL; @@ -202,164 +273,296 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, mask = bitmap.GetMask()->GetBitmap(); tool_pixmap = gtk_pixmap_new( pixmap, mask ); - } - gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); + gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); + + wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, + toggle, clientData, + helpString1, helpString2, + tool_pixmap ); - GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON - : GTK_TOOLBAR_CHILD_BUTTON; + GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON + : GTK_TOOLBAR_CHILD_BUTTON; - GtkWidget *item = gtk_toolbar_append_element + GtkWidget *item = gtk_toolbar_append_element ( GTK_TOOLBAR(m_toolbar), ctype, (GtkWidget *)NULL, (const char *)NULL, - helpString1, + helpString1.mbc_str(), "", tool_pixmap, (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool ); - tool->m_item = item; + tool->m_item = item; - gtk_signal_connect( GTK_OBJECT(tool->m_item), - "enter_notify_event", - GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback), - (gpointer)tool ); + gtk_signal_connect( GTK_OBJECT(tool->m_item), + "enter_notify_event", + GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback), + (gpointer)tool ); - m_tools.Append( tool ); + m_tools.Append( tool ); - return tool; + return tool; } void wxToolBar::AddSeparator() { - gtk_toolbar_append_space( m_toolbar ); + gtk_toolbar_append_space( m_toolbar ); } void wxToolBar::ClearTools() { - wxFAIL_MSG( "wxToolBar::ClearTools not implemented" ); + wxFAIL_MSG( _T("wxToolBar::ClearTools not implemented") ); } -void wxToolBar::Realize() +bool wxToolBar::Realize() { - m_x = 0; - m_y = 0; - m_width = 100; - m_height = 0; + m_x = 0; + m_y = 0; + m_width = 100; + m_height = 0; - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_bitmap1.Ok()) + wxNode *node = m_tools.First(); + while (node) { - int tool_height = tool->m_bitmap1.GetHeight(); - if (tool_height > m_height) m_height = tool_height; - } + wxToolBarTool *tool = (wxToolBarTool*)node->Data(); + if (tool->m_bitmap1.Ok()) + { + int tool_height = tool->m_bitmap1.GetHeight(); + if (tool_height > m_height) m_height = tool_height; + } - node = node->Next(); - } + node = node->Next(); + } - m_height += 12; + m_height += 5 + 2*m_yMargin; + + return TRUE; } void wxToolBar::EnableTool(int toolIndex, bool enable) { - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) - { - tool->m_enabled = enable; - return; + wxNode *node = m_tools.First(); + while (node) + { + wxToolBarTool *tool = (wxToolBarTool*)node->Data(); + 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 ); +*/ + + return; + } + node = node->Next(); } - node = node->Next(); - } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); } void wxToolBar::ToggleTool( int toolIndex, bool toggle ) { - wxNode *node = m_tools.First(); - while (node) - { - 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))) - gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(tool->m_item), toggle ); - return; + wxNode *node = m_tools.First(); + while (node) + { + 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))) + gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(tool->m_item), toggle ); + return; + } + node = node->Next(); } - node = node->Next(); - } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); } wxObject *wxToolBar::GetToolClientData( int index ) const { - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == index) return tool->m_clientData;; - node = node->Next(); - } + wxNode *node = m_tools.First(); + while (node) + { + wxToolBarTool *tool = (wxToolBarTool*)node->Data(); + if (tool->m_index == index) return tool->m_clientData;; + node = node->Next(); + } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); - return (wxObject*)NULL; + return (wxObject*)NULL; } bool wxToolBar::GetToolState(int toolIndex) const { - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) return tool->m_toggleState; - node = node->Next(); - } + wxNode *node = m_tools.First(); + while (node) + { + wxToolBarTool *tool = (wxToolBarTool*)node->Data(); + if (tool->m_index == toolIndex) return tool->m_toggleState; + node = node->Next(); + } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); - return FALSE; + return FALSE; } bool wxToolBar::GetToolEnabled(int toolIndex) const { - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) return tool->m_enabled; - node = node->Next(); - } + wxNode *node = m_tools.First(); + while (node) + { + wxToolBarTool *tool = (wxToolBarTool*)node->Data(); + if (tool->m_index == toolIndex) return tool->m_enabled; + node = node->Next(); + } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( _T("wrong toolbar index") ); - return FALSE; + return FALSE; } -void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) ) +void wxToolBar::SetMargins( int x, int y ) { -// wxFAIL_MSG( "wxToolBar::SetMargins not implemented" ); + wxCHECK_RET( !m_hasToolAlready, _T("wxToolBar::SetMargins must be called before adding tool.") ); + + if (x > 2) gtk_toolbar_append_space( m_toolbar ); // oh well + + m_xMargin = x; + m_yMargin = 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 ) { - gtk_toolbar_set_space_size( m_toolbar, separation ); + gtk_toolbar_set_space_size( m_toolbar, separation ); + m_separation = separation; +} + +int wxToolBar::GetToolPacking() +{ + return 0; +} + +int wxToolBar::GetToolSeparation() +{ + return m_separation; +} + +wxString wxToolBar::GetToolLongHelp(int toolIndex) +{ + wxNode *node = m_tools.First(); + while (node) + { + wxToolBarTool *tool = (wxToolBarTool*)node->Data(); + if (tool->m_index == toolIndex) + { + return tool->m_longHelpString; + } + node = node->Next(); + } + + wxFAIL_MSG( _T("wrong toolbar index") ); + + return _T(""); +} + +wxString wxToolBar::GetToolShortHelp(int toolIndex) +{ + wxNode *node = m_tools.First(); + while (node) + { + wxToolBarTool *tool = (wxToolBarTool*)node->Data(); + if (tool->m_index == toolIndex) + { + return tool->m_shortHelpString; + } + node = node->Next(); + } + + wxFAIL_MSG( _T("wrong toolbar index") ); + + return _T(""); +} + +void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString) +{ + wxNode *node = m_tools.First(); + while (node) + { + wxToolBarTool *tool = (wxToolBarTool*)node->Data(); + if (tool->m_index == toolIndex) + { + tool->m_longHelpString = helpString; + return; + } + node = node->Next(); + } + + wxFAIL_MSG( _T("wrong toolbar index") ); + + return; +} + +void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString) +{ + wxNode *node = m_tools.First(); + while (node) + { + wxToolBarTool *tool = (wxToolBarTool*)node->Data(); + if (tool->m_index == toolIndex) + { + tool->m_shortHelpString = helpString; + return; + } + node = node->Next(); + } + + 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(); + } }