"const" added to wxAceelTable ctor

[wxWidgets.git] / src / gtk1 / tbargtk.cpp

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 12dd7b66a73b2c6faf7b2de0386c57060e82c3d2..1ced090e504559129fc012faf26a49b27173aace 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -4,9 +4,9 @@
 // Author:      Robert Roebling
 // Modified by:
 // Created:     01/02/97
 // Author:      Robert Roebling
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      
+// RCS-ID:

 // Copyright:   (c) Robert Roebling
 // Copyright:   (c) Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -14,17 +14,25 @@
 #endif
 
 #include "wx/toolbar.h"
 #endif
 
 #include "wx/toolbar.h"

+#include <wx/intl.h>
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;

 
 //-----------------------------------------------------------------------------
 // wxToolBarTool
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject)
 
 //-----------------------------------------------------------------------------
 // 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 wxBitmap& bitmap1, const  wxBitmap& bitmap2,
       bool toggle, wxObject *clientData,

-      const wxString& shortHelpString, const wxString& longHelpString )
+      const wxString& shortHelpString, const wxString& longHelpString,
+      GtkWidget *item  )

 {
   m_owner = owner;
   m_index = theIndex;
 {
   m_owner = owner;
   m_index = theIndex;


@@ -38,71 +46,86 @@ wxToolBarTool::wxToolBarTool( wxToolBar *owner, int theIndex,
   m_isMenuCommand = TRUE;
   m_clientData = clientData;
   m_deleteSecondBitmap = FALSE;
   m_isMenuCommand = TRUE;
   m_clientData = clientData;
   m_deleteSecondBitmap = FALSE;

-};
+  m_item = item;
+}

 
 

-wxToolBarTool::~wxToolBarTool(void)
+wxToolBarTool::~wxToolBarTool()

 {
 {

-};
+}

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxToolBar
+// "clicked" (internal from gtk_toolbar)

 //-----------------------------------------------------------------------------
 
 static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
 {
 //-----------------------------------------------------------------------------
 
 static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
 {

+  if (g_blockEventsOnDrag) return;

   if (!tool->m_enabled) 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 );

-};
+}

 
 

+//-----------------------------------------------------------------------------
+// "enter_notify_event"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl)
+static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), 
+  GdkEventCrossing *WXUNUSED(gdk_event), wxToolBarTool *tool )
+{
+  if (g_blockEventsOnDrag) return TRUE;
+  
+  tool->m_owner->OnMouseEnter( tool->m_index );
+  
+  return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// wxToolBar
+//-----------------------------------------------------------------------------

 
 

-BEGIN_EVENT_TABLE(wxToolBar, wxControl)
-END_EVENT_TABLE()
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl)

 
 

-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 );
   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;
   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 );
   PreCreation( parent, id, pos, size, style, name );
 
   m_tools.DeleteContents( TRUE );

-    
+

   m_widget = gtk_handle_box_new();
   m_widget = gtk_handle_box_new();

-  
+

   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 ) );

-  
+

   gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
   gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );

-  
+

   gtk_widget_show( GTK_WIDGET(m_toolbar) );
   gtk_widget_show( GTK_WIDGET(m_toolbar) );

-  
+

   PostCreation();
   PostCreation();

-  
+

   Show( TRUE );
   Show( TRUE );

-    
+

   return TRUE;
   return TRUE;

-};
+}

 
 bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown )
 {
 
 bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown )
 {


@@ -114,7 +137,7 @@ bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown )
   GetEventHandler()->ProcessEvent(event);
 
   return TRUE;
   GetEventHandler()->ProcessEvent(event);
 
   return TRUE;

-};
+}

 
 void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y) )
 {
 
 void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y) )
 {


@@ -123,55 +146,68 @@ void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y
   event.SetInt( toolIndex );
 
   GetEventHandler()->ProcessEvent(event);
   event.SetInt( toolIndex );
 
   GetEventHandler()->ProcessEvent(event);

-};
+}

 
 void wxToolBar::OnMouseEnter( int toolIndex )
 {
 
 void wxToolBar::OnMouseEnter( int toolIndex )
 {

-  wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, toolIndex );
+  wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, GetId() );

   event.SetEventObject(this);
   event.SetInt( toolIndex );
   event.SetEventObject(this);
   event.SetInt( toolIndex );

-
+  

   GetEventHandler()->ProcessEvent(event);
   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 )
 {
   const wxBitmap& pushedBitmap, bool toggle,
   float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
   const wxString& helpString1, const wxString& helpString2 )
 {

-  if (!bitmap.Ok()) return NULL;
+  if (!bitmap.Ok()) return (wxToolBarTool *) NULL;
+
+  wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, toggle,
+    clientData, helpString1, helpString2 );
+
+  GtkWidget *tool_pixmap = (GtkWidget *) NULL;

   
   

-  wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, toggle, 
-  clientData, helpString1, helpString2 );
+  wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL, "wxToolBar doesn't support GdkBitmap" )

   
   

-  GdkPixmap *pixmap = bitmap.GetPixmap();
+  wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL, "wxToolBar::Add needs a wxBitmap" )

   
   

-  GdkBitmap *mask = NULL;
-  if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
+  if (TRUE)
+  {
+    GdkPixmap *pixmap = bitmap.GetPixmap();
+
+    GdkBitmap *mask = (GdkBitmap *) NULL;
+    if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
+    
+    tool_pixmap = gtk_pixmap_new( pixmap, mask );
+  }

   
   

-  GtkWidget *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 );

-  
+

   GtkToolbarChildType ctype = GTK_TOOLBAR_CHILD_BUTTON;
   if (toggle) ctype = GTK_TOOLBAR_CHILD_TOGGLEBUTTON;
   GtkToolbarChildType ctype = GTK_TOOLBAR_CHILD_BUTTON;
   if (toggle) ctype = GTK_TOOLBAR_CHILD_TOGGLEBUTTON;

-  
-  gtk_toolbar_append_element( m_toolbar, 
-    ctype, NULL, NULL, helpString1, "", tool_pixmap, (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool );
-    
-  m_tools.Append( tool );    
-    
+
+  tool->m_item = gtk_toolbar_append_element( m_toolbar, ctype, (GtkWidget *) NULL, (const char *) NULL, helpString1, "", tool_pixmap, 
+                                             (GtkSignalFunc)gtk_toolbar_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 );
+

   return tool;
   return tool;

-};
+}

 
 void wxToolBar::AddSeparator(void)
 {
   gtk_toolbar_append_space( m_toolbar );
 
 void wxToolBar::AddSeparator(void)
 {
   gtk_toolbar_append_space( m_toolbar );

-};
+}

 
 void wxToolBar::ClearTools(void)
 {
 
 void wxToolBar::ClearTools(void)
 {

-  wxFAIL_MSG("wxToolBar::ClearTools not implemented");
-};
+  wxFAIL_MSG( "wxToolBar::ClearTools not implemented" );
+}

 
 void wxToolBar::Realize(void)
 {
 
 void wxToolBar::Realize(void)
 {


@@ -188,13 +224,13 @@ void wxToolBar::Realize(void)
     {
       int tool_height = tool->m_bitmap1.GetHeight();
       if (tool_height > m_height) m_height = tool_height;
     {
       int tool_height = tool->m_bitmap1.GetHeight();
       if (tool_height > m_height) m_height = tool_height;

-    };
+    }

     
     node = node->Next();
     
     node = node->Next();

-  };
+  }

   
   m_height += 10;
   
   m_height += 10;

-};
+}

 
 void wxToolBar::EnableTool(int toolIndex, bool enable)
 {
 
 void wxToolBar::EnableTool(int toolIndex, bool enable)
 {


@@ -208,15 +244,31 @@ void wxToolBar::EnableTool(int toolIndex, bool enable)
       return;
     }
     node = node->Next();
       return;
     }
     node = node->Next();

-  };
-};
+  }
+  
+  wxFAIL_MSG( "wrong toolbar index" );
+}

 
 

-void wxToolBar::ToggleTool(int WXUNUSED(toolIndex), bool WXUNUSED(toggle) ) 
+void wxToolBar::ToggleTool( int toolIndex, bool toggle ) 

 {
 {

-  wxFAIL_MSG("wxToolBar::ToggleTool not implemented");
-};
+  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();
+  }
+  
+  wxFAIL_MSG( "wrong toolbar index" );
+}

 
 

-wxObject *wxToolBar::GetToolClientData(int index) const
+wxObject *wxToolBar::GetToolClientData( int index ) const

 {
   wxNode *node = m_tools.First();
   while (node)
 {
   wxNode *node = m_tools.First();
   while (node)


@@ -224,9 +276,12 @@ wxObject *wxToolBar::GetToolClientData(int index) const
     wxToolBarTool *tool = (wxToolBarTool*)node->Data();
     if (tool->m_index == index) return tool->m_clientData;;
     node = node->Next();
     wxToolBarTool *tool = (wxToolBarTool*)node->Data();
     if (tool->m_index == index) return tool->m_clientData;;
     node = node->Next();

-  };
+  }
+  
+  wxFAIL_MSG( "wrong toolbar index" );
+  

   return (wxObject*)NULL;
   return (wxObject*)NULL;

-};
+}

 
 bool wxToolBar::GetToolState(int toolIndex) const
 {
 
 bool wxToolBar::GetToolState(int toolIndex) const
 {


@@ -236,9 +291,12 @@ bool wxToolBar::GetToolState(int toolIndex) const
     wxToolBarTool *tool = (wxToolBarTool*)node->Data();
     if (tool->m_index == toolIndex) return tool->m_toggleState;
     node = node->Next();
     wxToolBarTool *tool = (wxToolBarTool*)node->Data();
     if (tool->m_index == toolIndex) return tool->m_toggleState;
     node = node->Next();

-  };
+  }
+  
+  wxFAIL_MSG( "wrong toolbar index" );
+  

   return FALSE;
   return FALSE;

-};
+}

 
 bool wxToolBar::GetToolEnabled(int toolIndex) const
 {
 
 bool wxToolBar::GetToolEnabled(int toolIndex) const
 {


@@ -248,20 +306,23 @@ bool wxToolBar::GetToolEnabled(int toolIndex) const
     wxToolBarTool *tool = (wxToolBarTool*)node->Data();
     if (tool->m_index == toolIndex) return tool->m_enabled;
     node = node->Next();
     wxToolBarTool *tool = (wxToolBarTool*)node->Data();
     if (tool->m_index == toolIndex) return tool->m_enabled;
     node = node->Next();

-  };
+  }
+  
+  wxFAIL_MSG( "wrong toolbar index" );
+  

   return FALSE;
   return FALSE;

-};
+}

 
 void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) )
 {
 
 void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) )
 {

-};
+}

 
 void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
 {
 
 void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
 {

-};
+}

 
 void wxToolBar::SetToolSeparation( int separation )
 {
   gtk_toolbar_set_space_size( m_toolbar, separation );
 
 void wxToolBar::SetToolSeparation( int separation )
 {
   gtk_toolbar_set_space_size( m_toolbar, separation );

-};
+}