fix for precompiled headers

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

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 3892f89d73a73c698c5db3aaf77bc0f6b078a2ca..491eea3cd268d64d4630e451e79ccb1357d90e0e 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -15,6 +15,12 @@
 
 #include "wx/toolbar.h"
 
 
 #include "wx/toolbar.h"
 

+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+

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


@@ -22,9 +28,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 )
+                              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;


@@ -38,46 +47,61 @@ 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()
 {
 
 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;
 
   tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState );
   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 );

-};
+}

 
 

+//-----------------------------------------------------------------------------
+// "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;
+}

 
 

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

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

-};
+}

 
 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( wxWindow *parent, wxWindowID id,
   const wxPoint& pos, const wxSize& size,
   long style, const wxString& name )
 {
   Create( parent, id, pos, size, style, name );

-};
+}

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

-};
+}

 
 bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
   const wxPoint& pos, const wxSize& size,
 
 bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
   const wxPoint& pos, const wxSize& size,


@@ -91,7 +115,9 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
 
   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_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );

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


@@ -102,7 +128,7 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
   Show( TRUE );
 
   return TRUE;
   Show( TRUE );
 
   return TRUE;

-};
+}

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


@@ -114,7 +140,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,57 +149,95 @@ 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,
   const wxBitmap& pushedBitmap, bool toggle,
   float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
   const wxString& helpString1, const wxString& helpString2 )
 {
 
 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;
+  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 );

 
 

-  GdkPixmap *pixmap = bitmap.GetPixmap();
+  wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,
+               "wxToolBar doesn't support GdkBitmap" );

 
 

-  GdkBitmap *mask = NULL;
-  if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
+  wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,
+               "wxToolBar::Add needs a wxBitmap" );
+  
+  GtkWidget *tool_pixmap = (GtkWidget *)NULL;
+  
+  if (TRUE) // FIXME huh?
+  {
+    GdkPixmap *pixmap = bitmap.GetPixmap();

 
 

-  GtkWidget *tool_pixmap = gtk_pixmap_new( pixmap, mask );
+    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 );
 
   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,
-    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
+                     );
+
+  // VZ: we don't want GDK_NO_EXPOSE events because for some reason our
+  // toolbar buttons get them (it doesn't happen in a standalone GTK+ program
+  // for unknown reasons) and it prevents tooltips from appearing.
+  gtk_widget_set_events( GTK_WIDGET(item),
+                         gtk_widget_get_events( GTK_WIDGET(item) ) &
+                         ~GDK_EXPOSURE_MASK);
+  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;


@@ -188,13 +252,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 +272,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 +304,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 +319,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 +334,25 @@ 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) )
 {

-};
+  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 )
 {
   gtk_toolbar_set_space_size( m_toolbar, separation );
 
 void wxToolBar::SetToolSeparation( int separation )
 {
   gtk_toolbar_set_space_size( m_toolbar, separation );

-};
+}