Listctrl updates

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

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 1b45b695c427fa08608fe105d80df1fdf9710b03..d8323989a0d3ee32d919e3281d50731691ce01e1 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -2,9 +2,7 @@
 // Name:        tbargtk.cpp
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // Name:        tbargtk.cpp
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling

-// Modified by:
-// Created:     01/02/97
-// RCS-ID:
+// RCS-ID:      $Id$

 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,7 +12,12 @@
 #endif
 
 #include "wx/toolbar.h"
 #endif
 
 #include "wx/toolbar.h"

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

 
 //-----------------------------------------------------------------------------
 // wxToolBarTool
 
 //-----------------------------------------------------------------------------
 // wxToolBarTool


@@ -23,10 +26,12 @@
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject)
 
 wxToolBarTool::wxToolBarTool( wxToolBar *owner, int theIndex,
 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  )
+                              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_owner = owner;
   m_index = theIndex;


@@ -48,11 +53,12 @@ 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_isToggle) tool->m_toggleState = !tool->m_toggleState;
   if (!tool->m_enabled) return;
 
   if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState;


@@ -60,12 +66,25 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *to
   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 FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// wxToolBar
+//-----------------------------------------------------------------------------

 
 

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

 
 wxToolBar::wxToolBar()
 {
 
 wxToolBar::wxToolBar()
 {


@@ -92,14 +111,19 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
 
   m_tools.DeleteContents( TRUE );
 
 
   m_tools.DeleteContents( TRUE );
 

-  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 ) );
+  m_widget = GTK_WIDGET(m_toolbar);                                        
+                                           
+  gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );

 
 

-  gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
-
-  gtk_widget_show( GTK_WIDGET(m_toolbar) );
+  gtk_toolbar_append_space( m_toolbar );
+  
+  m_parent->AddChild( this );

 
 

+  (m_parent->m_insertCallback)( m_parent, this );
+  

   PostCreation();
 
   Show( TRUE );
   PostCreation();
 
   Show( TRUE );


@@ -130,10 +154,10 @@ void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y
 
 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);
 }
 


@@ -142,51 +166,73 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
   float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
   const wxString& helpString1, const wxString& helpString2 )
 {
   float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
   const wxString& helpString1, const wxString& helpString2 )
 {

-  if (!bitmap.Ok()) return NULL;
+  wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
+               "invalid bitmap for wxToolBar icon" );

 
 

-  wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, toggle,
-    clientData, helpString1, helpString2 );
+  wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap,
+                                           toggle, clientData,
+                                           helpString1, helpString2 );

 
 

-  GtkWidget *tool_pixmap = NULL;
-  
-  wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL, "wxToolBar doesn't support GdkBitmap" )
+  wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,
+               "wxToolBar doesn't support GdkBitmap" );
+
+  wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,
+               "wxToolBar::Add needs a wxBitmap" );

   
   

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

   
   

-  if (TRUE)
+  if (TRUE) // FIXME huh?

   {
     GdkPixmap *pixmap = bitmap.GetPixmap();
 
   {
     GdkPixmap *pixmap = bitmap.GetPixmap();
 

-    GdkBitmap *mask = NULL;
-    if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
+    GdkBitmap *mask = (GdkBitmap *)NULL;
+    if ( bitmap.GetMask() )
+      mask = bitmap.GetMask()->GetBitmap();

     
     tool_pixmap = gtk_pixmap_new( pixmap, mask );
   }
   
   gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
 
     
     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;
-
-  tool->m_item = gtk_toolbar_append_element( m_toolbar, ctype, NULL, NULL, helpString1, "", tool_pixmap, 
-                                             (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool );
+  GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON
+                                     : GTK_TOOLBAR_CHILD_BUTTON;
+
+  GtkWidget *item = gtk_toolbar_append_element
+                     (
+                      GTK_TOOLBAR(m_toolbar),
+                      ctype,
+                      (GtkWidget *)NULL,
+                      (const char *)NULL,
+                      helpString1,
+                      "",
+                      tool_pixmap,
+                      (GtkSignalFunc)gtk_toolbar_callback,
+                      (gpointer)tool
+                     );
+
+  tool->m_item = item;
+
+  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;
 }
 
 
   m_tools.Append( tool );
 
   return tool;
 }
 

-void wxToolBar::AddSeparator(void)
+void wxToolBar::AddSeparator()

 {
   gtk_toolbar_append_space( m_toolbar );
 }
 
 {
   gtk_toolbar_append_space( m_toolbar );
 }
 

-void wxToolBar::ClearTools(void)
+void wxToolBar::ClearTools()

 {
   wxFAIL_MSG( "wxToolBar::ClearTools not implemented" );
 }
 
 {
   wxFAIL_MSG( "wxToolBar::ClearTools not implemented" );
 }
 

-void wxToolBar::Realize(void)
+void wxToolBar::Realize()

 {
   m_x = 0;
   m_y = 0;
 {
   m_x = 0;
   m_y = 0;


@@ -206,7 +252,7 @@ void wxToolBar::Realize(void)
     node = node->Next();
   }
   
     node = node->Next();
   }
   

-  m_height += 10;
+  m_height += 12;

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


@@ -292,10 +338,12 @@ bool wxToolBar::GetToolEnabled(int toolIndex) const
 
 void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) )
 {
 
 void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) )
 {

+//  wxFAIL_MSG( "wxToolBar::SetMargins not implemented" );

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

+  wxFAIL_MSG( "wxToolBar::SetToolPacking not implemented" );

 }
 
 void wxToolBar::SetToolSeparation( int separation )
 }
 
 void wxToolBar::SetToolSeparation( int separation )