X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..54ff4a701f6c83aad8387a31b652f209681210cb:/src/gtk1/tbargtk.cpp

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 628b35c69d..12dd7b66a7 100644
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -21,9 +21,9 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject)
   
-wxToolBarTool::wxToolBarTool( wxToolBarGTK *owner, const int theIndex, 
-      const wxBitmap& bitmap1, const  wxBitmap& bitmap2, 
-      const bool toggle, wxObject *clientData,
+wxToolBarTool::wxToolBarTool( wxToolBar *owner, int theIndex, 
+      const wxBitmap& bitmap1, const  wxBitmap& bitmap2,
+      bool toggle, wxObject *clientData,
       const wxString& shortHelpString, const wxString& longHelpString )
 {
   m_owner = owner;
@@ -45,7 +45,7 @@ wxToolBarTool::~wxToolBarTool(void)
 };
 
 //-----------------------------------------------------------------------------
-// wxToolBarGTK
+// wxToolBar
 //-----------------------------------------------------------------------------
 
 static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
@@ -59,29 +59,29 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *to
 
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarGTK,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl)
 
-BEGIN_EVENT_TABLE(wxToolBarGTK, wxControl)
+BEGIN_EVENT_TABLE(wxToolBar, wxControl)
 END_EVENT_TABLE()
 
-wxToolBarGTK::wxToolBarGTK(void)
+wxToolBar::wxToolBar(void)
 {
 };
 
-wxToolBarGTK::wxToolBarGTK( wxWindow *parent, const wxWindowID id, 
+wxToolBar::wxToolBar( wxWindow *parent, wxWindowID id, 
   const wxPoint& pos, const wxSize& size,
-  const long style, const wxString& name )
+  long style, const wxString& name )
 {
   Create( parent, id, pos, size, style, name );
 };
 
-wxToolBarGTK::~wxToolBarGTK(void)
+wxToolBar::~wxToolBar(void)
 {
 };
 
-bool wxToolBarGTK::Create( wxWindow *parent, const wxWindowID id, 
+bool wxToolBar::Create( wxWindow *parent, wxWindowID id, 
   const wxPoint& pos, const wxSize& size,
-  const long style, const wxString& name )
+  long style, const wxString& name )
 {
   m_needParent = TRUE;
   
@@ -104,10 +104,11 @@ bool wxToolBarGTK::Create( wxWindow *parent, const wxWindowID id,
   return TRUE;
 };
 
-bool wxToolBarGTK::OnLeftClick( int toolIndex, bool toggleDown )
+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);
@@ -115,25 +116,27 @@ bool wxToolBarGTK::OnLeftClick( int toolIndex, bool toggleDown )
   return TRUE;
 };
 
-void wxToolBarGTK::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y) )
+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 wxToolBarGTK::OnMouseEnter( int toolIndex )
+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 *wxToolBarGTK::AddTool( const int toolIndex, const wxBitmap& bitmap, 
-  const wxBitmap& pushedBitmap, const bool toggle, 
-  const float WXUNUSED(xPos), const float WXUNUSED(yPos), wxObject *clientData,  
+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;
@@ -160,48 +163,105 @@ wxToolBarTool *wxToolBarGTK::AddTool( const int toolIndex, const wxBitmap& bitma
   return tool;
 };
 
-void wxToolBarGTK::AddSeparator(void)
+void wxToolBar::AddSeparator(void)
 {
   gtk_toolbar_append_space( m_toolbar );
 };
 
-void wxToolBarGTK::ClearTools(void)
+void wxToolBar::ClearTools(void)
 {
+  wxFAIL_MSG("wxToolBar::ClearTools not implemented");
 };
 
-void wxToolBarGTK::EnableTool(const int toolIndex, const 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 wxToolBarGTK::ToggleTool(const int toolIndex, const 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 wxToolBarGTK::SetToggle(const int toolIndex, const bool toggle) 
+void wxToolBar::ToggleTool(int WXUNUSED(toolIndex), bool WXUNUSED(toggle) ) 
 {
+  wxFAIL_MSG("wxToolBar::ToggleTool not implemented");
 };
 
-wxObject *wxToolBarGTK::GetToolClientData(const int index) const
+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 wxToolBarGTK::GetToolState(const int toolIndex) const
+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 wxToolBarGTK::GetToolEnabled(const int toolIndex) const
+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 wxToolBarGTK::SetMargins(const int x, const int y)
+void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) )
 {
 };
 
-void wxToolBarGTK::SetToolPacking(const int packing)
+void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
 {
 };
 
-void wxToolBarGTK::SetToolSeparation(const int separation)
+void wxToolBar::SetToolSeparation( int separation )
 {
+  gtk_toolbar_set_space_size( m_toolbar, separation );
 };