Tought Systemettings that sysfont has 12 pts

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 611995d467bb3b541e93e9db71e92769cf09cf92..5af767a335151ac35751169244a838bc2e223412 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -2,11 +2,9 @@
 // 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
 // Copyright:   (c) Robert Roebling

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

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


@@ -15,16 +13,25 @@
 
 #include "wx/toolbar.h"
 
 
 #include "wx/toolbar.h"
 

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

 //-----------------------------------------------------------------------------
 // wxToolBarTool
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject)
 //-----------------------------------------------------------------------------
 // wxToolBarTool
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject)

-  
-wxToolBarTool::wxToolBarTool( wxToolBarGTK *owner, int theIndex, 
-      const wxBitmap& bitmap1, const  wxBitmap& bitmap2,
-      bool toggle, wxObject *clientData,
-      const wxString& shortHelpString, const wxString& longHelpString )
+
+wxToolBarTool::wxToolBarTool( wxToolBar *owner, int theIndex,
+                              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,170 +45,303 @@ wxToolBarTool::wxToolBarTool( wxToolBarGTK *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()

 {
 {

-};
+}

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

-// wxToolBarGTK
+// "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(wxToolBarGTK,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(wxToolBarGTK, wxControl)
-END_EVENT_TABLE()
+//-----------------------------------------------------------------------------
+// wxToolBar
+//-----------------------------------------------------------------------------

 
 

-wxToolBarGTK::wxToolBarGTK(void)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl)
+
+wxToolBar::wxToolBar()

 {
 {

-};
+}

 
 

-wxToolBarGTK::wxToolBarGTK( 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 );

-};
+}

 
 

-wxToolBarGTK::~wxToolBarGTK(void)
+wxToolBar::~wxToolBar()

 {
 {

-};
+}

 
 

-bool wxToolBarGTK::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_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) );
-  
+
+  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 );
+

   PostCreation();
   PostCreation();

-  
+

   Show( TRUE );
   Show( TRUE );

-    
+

   return TRUE;
   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.SetEventObject(this);

+  event.SetInt( toolIndex );

   event.SetExtraLong((long) toggleDown);
 
   GetEventHandler()->ProcessEvent(event);
 
   return TRUE;
   event.SetExtraLong((long) toggleDown);
 
   GetEventHandler()->ProcessEvent(event);
 
   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);
 
   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, GetId() );

   event.SetEventObject(this);
   event.SetEventObject(this);

-
+  event.SetInt( toolIndex );
+  

   GetEventHandler()->ProcessEvent(event);
   GetEventHandler()->ProcessEvent(event);

-};
+}

 
 

-wxToolBarTool *wxToolBarGTK::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;
-  
-  wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, toggle, 
-  clientData, helpString1, helpString2 );
+  wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
+               "invalid bitmap for wxToolBar icon" );
+
+  wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap,
+                                           toggle, clientData,
+                                           helpString1, helpString2 );
+
+  wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,
+               "wxToolBar doesn't support GdkBitmap" );
+
+  wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,
+               "wxToolBar::Add needs a wxBitmap" );

   
   

-  GdkPixmap *pixmap = bitmap.GetPixmap();
+  GtkWidget *tool_pixmap = (GtkWidget *)NULL;

   
   

-  GdkBitmap *mask = NULL;
-  if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
+  if (TRUE) // FIXME huh?
+  {
+    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;
-  
-  gtk_toolbar_append_element( m_toolbar, 
-    ctype, NULL, NULL, helpString1, "", tool_pixmap, (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool );
-    
-  m_tools.Append( 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;
   return tool;

-};
+}

 
 

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

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

-};
+}

 
 

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

 {
 {

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

 
 

-void wxToolBarGTK::EnableTool(int toolIndex, bool enable)
+void wxToolBar::Realize()

 {
 {

-};
+  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(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();
+  }
+  
+  wxFAIL_MSG( "wrong toolbar index" );
+}

 
 

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

 {
 {

-};
+  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 *wxToolBarGTK::GetToolClientData(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();
+  }
+  
+  wxFAIL_MSG( "wrong toolbar index" );
+  
+  return (wxObject*)NULL;
+}

 
 

-bool wxToolBarGTK::GetToolState(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();
+  }
+  
+  wxFAIL_MSG( "wrong toolbar index" );
+  
+  return FALSE;
+}

 
 

-bool wxToolBarGTK::GetToolEnabled(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();
+  }
+  
+  wxFAIL_MSG( "wrong toolbar index" );
+  
+  return FALSE;
+}

 
 

-void wxToolBarGTK::SetMargins(int x, int y)
+void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) )

 {
 {

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

 
 

-void wxToolBarGTK::SetToolPacking(int packing)
+void wxToolBar::SetToolPacking( int WXUNUSED(packing) )

 {
 {

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

 
 

-void wxToolBarGTK::SetToolSeparation(int separation)
+void wxToolBar::SetToolSeparation( int separation )

 {
 {

-};
+  gtk_toolbar_set_space_size( m_toolbar, separation );
+}