X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/716b736420b6f9722f44c53931ceeeb23e8e54e4..30dea05497c1f00d72d7dbf7f2f4818dfaa0e500:/src/gtk/tbargtk.cpp diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index ebf329df11..00a20b4236 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -4,9 +4,9 @@ // Author: Robert Roebling // Modified by: // Created: 01/02/97 -// RCS-ID: +// RCS-ID: // Copyright: (c) Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -14,14 +14,15 @@ #endif #include "wx/toolbar.h" +#include //----------------------------------------------------------------------------- // wxToolBarTool //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject) - -wxToolBarTool::wxToolBarTool( wxToolBar *owner, int theIndex, + +wxToolBarTool::wxToolBarTool( wxToolBar *owner, int theIndex, const wxBitmap& bitmap1, const wxBitmap& bitmap2, bool toggle, wxObject *clientData, const wxString& shortHelpString, const wxString& longHelpString ) @@ -40,7 +41,7 @@ wxToolBarTool::wxToolBarTool( wxToolBar *owner, int theIndex, m_deleteSecondBitmap = FALSE; }; -wxToolBarTool::~wxToolBarTool(void) +wxToolBarTool::~wxToolBarTool() { }; @@ -51,9 +52,9 @@ wxToolBarTool::~wxToolBarTool(void) static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool ) { if (!tool->m_enabled) return; - + if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState; - + tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState ); }; @@ -64,50 +65,51 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl) BEGIN_EVENT_TABLE(wxToolBar, wxControl) END_EVENT_TABLE() -wxToolBar::wxToolBar(void) +wxToolBar::wxToolBar() { }; -wxToolBar::wxToolBar( wxWindow *parent, wxWindowID id, +wxToolBar::wxToolBar( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) { Create( parent, id, pos, size, style, name ); }; -wxToolBar::~wxToolBar(void) +wxToolBar::~wxToolBar() { }; -bool wxToolBar::Create( wxWindow *parent, wxWindowID id, +bool wxToolBar::Create( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) { m_needParent = TRUE; - + PreCreation( parent, id, pos, size, style, name ); m_tools.DeleteContents( TRUE ); - + m_widget = gtk_handle_box_new(); - + m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS ) ); - + gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) ); - + gtk_widget_show( GTK_WIDGET(m_toolbar) ); - + PostCreation(); - + Show( TRUE ); - + return TRUE; }; bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown ) { - wxCommandEvent event(wxEVT_COMMAND_TOOL_CLICKED, toolIndex); + wxCommandEvent event( wxEVT_COMMAND_TOOL_CLICKED, toolIndex ); event.SetEventObject(this); + event.SetInt( toolIndex ); event.SetExtraLong((long) toggleDown); GetEventHandler()->ProcessEvent(event); @@ -117,46 +119,48 @@ bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown ) void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y) ) { - wxCommandEvent event(wxEVT_COMMAND_TOOL_RCLICKED, toolIndex); - event.SetEventObject(this); + wxCommandEvent event( wxEVT_COMMAND_TOOL_RCLICKED, toolIndex ); + event.SetEventObject( this ); + event.SetInt( toolIndex ); GetEventHandler()->ProcessEvent(event); }; void wxToolBar::OnMouseEnter( int toolIndex ) { - wxCommandEvent event(wxEVT_COMMAND_TOOL_ENTER, toolIndex); + wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, toolIndex ); event.SetEventObject(this); + event.SetInt( toolIndex ); GetEventHandler()->ProcessEvent(event); }; -wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, +wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap, bool toggle, float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData, const wxString& helpString1, const wxString& helpString2 ) { if (!bitmap.Ok()) return NULL; - - wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, toggle, + + wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, toggle, clientData, helpString1, helpString2 ); - + GdkPixmap *pixmap = bitmap.GetPixmap(); - + GdkBitmap *mask = NULL; if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap(); - + GtkWidget *tool_pixmap = gtk_pixmap_new( pixmap, mask ); gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); - + GtkToolbarChildType ctype = GTK_TOOLBAR_CHILD_BUTTON; if (toggle) ctype = GTK_TOOLBAR_CHILD_TOGGLEBUTTON; - - gtk_toolbar_append_element( m_toolbar, + + gtk_toolbar_append_element( m_toolbar, ctype, NULL, NULL, helpString1, "", tool_pixmap, (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool ); - - m_tools.Append( tool ); - + + m_tools.Append( tool ); + return tool; }; @@ -167,41 +171,98 @@ void wxToolBar::AddSeparator(void) void wxToolBar::ClearTools(void) { + wxFAIL_MSG(_("wxToolBar::ClearTools not implemented")); }; -void wxToolBar::EnableTool(int toolIndex, bool enable) +void wxToolBar::Realize(void) { + 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()) + { + int tool_height = tool->m_bitmap1.GetHeight(); + if (tool_height > m_height) m_height = tool_height; + }; + + node = node->Next(); + }; + + m_height += 10; }; -void wxToolBar::ToggleTool(int toolIndex, bool toggle) +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; + } + node = node->Next(); + }; }; -void wxToolBar::SetToggle(int toolIndex, bool toggle) +void wxToolBar::ToggleTool(int WXUNUSED(toolIndex), bool WXUNUSED(toggle) ) { + wxFAIL_MSG(_("wxToolBar::ToggleTool not implemented")); }; 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(); + }; + 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(); + }; + 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(); + }; + return FALSE; }; -void wxToolBar::SetMargins(int x, int y) +void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) ) { }; -void wxToolBar::SetToolPacking(int packing) +void wxToolBar::SetToolPacking( int WXUNUSED(packing) ) { }; -void wxToolBar::SetToolSeparation(int separation) +void wxToolBar::SetToolSeparation( int separation ) { + gtk_toolbar_set_space_size( m_toolbar, separation ); };