wxSplitterWindow mouse capture improvements and cleanup.

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

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 16ead462ace489c7df4caedfb592608390d6fd65..be2f5ff3c68bcb7564cad6ef49eec9aad8e42e53 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tbargtk.cpp
+// Name:        src/gtk1/tbargtk.cpp

 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // Modified:    13.12.99 by VZ to derive from wxToolBarBase
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // Modified:    13.12.99 by VZ to derive from wxToolBarBase


@@ -16,23 +16,19 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "tbargtk.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/toolbar.h"
-

 #if wxUSE_TOOLBAR_NATIVE
 
 #if wxUSE_TOOLBAR_NATIVE
 

-#include "wx/frame.h"
+#include "wx/toolbar.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+#endif

 
 #include <glib.h>
 
 #include <glib.h>

-#include "wx/gtk/private.h"
-
-extern GdkFont *GtkGetDefaultGuiFont();
+#include "wx/gtk1/private.h"

 
 // ----------------------------------------------------------------------------
 // globals
 
 // ----------------------------------------------------------------------------
 // globals


@@ -62,11 +58,7 @@ static void GetGtkStyle(long style,
     {
         *gtkStyle = style & wxTB_NOICONS
                         ? GTK_TOOLBAR_TEXT
     {
         *gtkStyle = style & wxTB_NOICONS
                         ? GTK_TOOLBAR_TEXT

-                        : (
-#ifdef __WXGTK20__
-                          style & wxTB_HORZ_LAYOUT ? GTK_TOOLBAR_BOTH_HORIZ :
-#endif // __WXGTK20__
-                          GTK_TOOLBAR_BOTH);
+                        : GTK_TOOLBAR_BOTH;

     }
     else // no text, hence we must have the icons or what would we show?
     {
     }
     else // no text, hence we must have the icons or what would we show?
     {


@@ -96,8 +88,8 @@ public:
         Init();
     }
 
         Init();
     }
 

-    wxToolBarTool(wxToolBar *tbar, wxControl *control)
-        : wxToolBarToolBase(tbar, control)
+    wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
+        : wxToolBarToolBase(tbar, control, label)

     {
         Init();
     }
     {
         Init();
     }


@@ -120,7 +112,7 @@ public:
                 return GTK_TOOLBAR_CHILD_RADIOBUTTON;
 
             default:
                 return GTK_TOOLBAR_CHILD_RADIOBUTTON;
 
             default:

-                wxFAIL_MSG( _T("unknown toolbar child type") );
+                wxFAIL_MSG( wxT("unknown toolbar child type") );

                 // fall through
 
             case wxITEM_NORMAL:
                 // fall through
 
             case wxITEM_NORMAL:


@@ -128,6 +120,16 @@ public:
         }
     }
 
         }
     }
 

+    void SetPixmap(const wxBitmap& bitmap)
+    {
+        if (bitmap.Ok())
+        {
+            GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
+                                               : NULL;
+            gtk_pixmap_set( GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask );
+        }
+    }
+

     GtkWidget            *m_item;
     GtkWidget            *m_pixmap;
 
     GtkWidget            *m_item;
     GtkWidget            *m_pixmap;
 


@@ -149,6 +151,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 // "clicked" (internal from gtk_toolbar)
 //-----------------------------------------------------------------------------
 
 // "clicked" (internal from gtk_toolbar)
 //-----------------------------------------------------------------------------
 

+extern "C" {

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


@@ -166,16 +169,7 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
     {
         tool->Toggle();
 
     {
         tool->Toggle();
 

-        wxBitmap bitmap = tool->GetBitmap();
-        if ( bitmap.Ok() )
-        {
-            GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
-
-            GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
-                                               : (GdkBitmap *)NULL;
-
-            gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
-        }
+        tool->SetPixmap(tool->GetBitmap());

 
         if ( tool->IsRadio() && !tool->IsToggled() )
         {
 
         if ( tool->IsRadio() && !tool->IsToggled() )
         {


@@ -189,23 +183,16 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
         // revert back
         tool->Toggle();
 
         // revert back
         tool->Toggle();
 

-        wxBitmap bitmap = tool->GetBitmap();
-        if ( bitmap.Ok() )
-        {
-            GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
-
-            GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
-                                               : (GdkBitmap *)NULL;
-
-            gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
-        }
+        tool->SetPixmap(tool->GetBitmap());

     }
 }
     }
 }

+}

 
 //-----------------------------------------------------------------------------
 // "enter_notify_event" / "leave_notify_event"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "enter_notify_event" / "leave_notify_event"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget),
                                        GdkEventCrossing *gdk_event,
                                        wxToolBarTool *tool )
 static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget),
                                        GdkEventCrossing *gdk_event,
                                        wxToolBarTool *tool )


@@ -224,6 +211,7 @@ static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget),
 
     return FALSE;
 }
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxToolBar
 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxToolBar


@@ -242,7 +230,7 @@ static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent),
 void wxToolBarTool::Init()
 {
     m_item =
 void wxToolBarTool::Init()
 {
     m_item =

-    m_pixmap = (GtkWidget *)NULL;
+    m_pixmap = NULL;

 }
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,
 }
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,


@@ -258,9 +246,10 @@ wxToolBarToolBase *wxToolBar::CreateTool(int id,
                              clientData, shortHelpString, longHelpString);
 }
 
                              clientData, shortHelpString, longHelpString);
 }
 

-wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+wxToolBarToolBase *
+wxToolBar::CreateTool(wxControl *control, const wxString& label)

 {
 {

-    return new wxToolBarTool(this, control);
+    return new wxToolBarTool(this, control, label);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -269,8 +258,8 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
 
 void wxToolBar::Init()
 {
 
 void wxToolBar::Init()
 {

-    m_toolbar = (GtkToolbar *)NULL;
-    m_blockEvent = FALSE;
+    m_toolbar = NULL;
+    m_blockEvent = false;

     m_defaultWidth = 32;
     m_defaultHeight = 32;
 }
     m_defaultWidth = 32;
     m_defaultHeight = 32;
 }


@@ -286,7 +275,7 @@ bool wxToolBar::Create( wxWindow *parent,
                         long style,
                         const wxString& name )
 {
                         long style,
                         const wxString& name )
 {

-    m_needParent = TRUE;
+    m_needParent = true;

     m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
 
     if ( !PreCreation( parent, pos, size ) ||
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
 
     if ( !PreCreation( parent, pos, size ) ||


@@ -294,23 +283,16 @@ bool wxToolBar::Create( wxWindow *parent,
     {
         wxFAIL_MSG( wxT("wxToolBar creation failed") );
 
     {
         wxFAIL_MSG( wxT("wxToolBar creation failed") );
 

-        return FALSE;
+        return false;

     }
 
     }
 

-#ifdef __WXGTK20__
-    m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
-    GtkSetStyle();
+    FixupStyle();

 
 

-    // Doesn't work this way.
-    // GtkToolbarSpaceStyle space_style = GTK_TOOLBAR_SPACE_EMPTY;
-    // gtk_widget_style_set (GTK_WIDGET (m_toolbar), "space_style", &space_style, NULL);
-#else

     GtkOrientation orient;
     GtkToolbarStyle gtkStyle;
     GetGtkStyle(style, &orient, &gtkStyle);
 
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new(orient, gtkStyle) );
     GtkOrientation orient;
     GtkToolbarStyle gtkStyle;
     GetGtkStyle(style, &orient, &gtkStyle);
 
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new(orient, gtkStyle) );

-#endif

 
     SetToolSeparation(7);
 
 
     SetToolSeparation(7);
 


@@ -333,17 +315,14 @@ bool wxToolBar::Create( wxWindow *parent,
 
     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
 
 
     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
 

-    // FIXME: there is no such function for toolbars in 2.0
-#ifndef __WXGTK20__

     if (style & wxTB_FLAT)
         gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
     if (style & wxTB_FLAT)
         gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );

-#endif

 
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 
 
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 

-    return TRUE;
+    return true;

 }
 
 void wxToolBar::GtkSetStyle()
 }
 
 void wxToolBar::GtkSetStyle()


@@ -368,13 +347,9 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 {
     wxToolBarTool *tool = (wxToolBarTool *)toolBase;
 
 {
     wxToolBarTool *tool = (wxToolBarTool *)toolBase;
 

-#ifndef __WXGTK20__

     // if we have inserted a space before all the tools we must change the GTK
     // index by 1
     size_t posGtk = m_xMargin > 1 ? pos + 1 : pos;
     // if we have inserted a space before all the tools we must change the GTK
     // index by 1
     size_t posGtk = m_xMargin > 1 ? pos + 1 : pos;

-#else
-    size_t posGtk = pos;
-#endif

 
     if ( tool->IsButton() )
     {
 
     if ( tool->IsButton() )
     {


@@ -382,22 +357,22 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
         {
             wxBitmap bitmap = tool->GetNormalBitmap();
 
         {
             wxBitmap bitmap = tool->GetNormalBitmap();
 

-            wxCHECK_MSG( bitmap.Ok(), FALSE,
+            wxCHECK_MSG( bitmap.Ok(), false,

                          wxT("invalid bitmap for wxToolBar icon") );
 
                          wxT("invalid bitmap for wxToolBar icon") );
 

-            wxCHECK_MSG( bitmap.GetBitmap() == NULL, FALSE,
+            wxCHECK_MSG( bitmap.GetBitmap() == NULL, false,

                          wxT("wxToolBar doesn't support GdkBitmap") );
 
                          wxT("wxToolBar doesn't support GdkBitmap") );
 

-            wxCHECK_MSG( bitmap.GetPixmap() != NULL, FALSE,
+            wxCHECK_MSG( bitmap.GetPixmap() != NULL, false,

                          wxT("wxToolBar::Add needs a wxBitmap") );
 
                          wxT("wxToolBar::Add needs a wxBitmap") );
 

-            GtkWidget *tool_pixmap = (GtkWidget *)NULL;
+            GtkWidget *tool_pixmap = NULL;

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

-            GdkBitmap *mask = (GdkBitmap *)NULL;
+            GdkBitmap *mask = NULL;

             if ( bitmap.GetMask() )
             if ( bitmap.GetMask() )

-              mask = bitmap.GetMask()->GetBitmap();
+                mask = bitmap.GetMask()->GetBitmap();

 
             tool_pixmap = gtk_pixmap_new( pixmap, mask );
             gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE );
 
             tool_pixmap = gtk_pixmap_new( pixmap, mask );
             gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE );


@@ -421,15 +396,16 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                 {
                     wxToolBarToolsList::compatibility_iterator node
                         = wxToolBarToolsList::compatibility_iterator();
                 {
                     wxToolBarToolsList::compatibility_iterator node
                         = wxToolBarToolsList::compatibility_iterator();

-                    if ( pos ) node = m_tools.Item(pos - 1);
+                    if ( pos )
+                        node = m_tools.Item(pos - 1);

 
                     while ( node )
                     {
 
                     while ( node )
                     {

-                        wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
-                        if ( !tool->IsRadio() )
+                        wxToolBarTool *toolNext = (wxToolBarTool *)node->GetData();
+                        if ( !toolNext->IsRadio() )

                             break;
 
                             break;
 

-                        widget = tool->m_item;
+                        widget = toolNext->m_item;

 
                         node = node->GetPrevious();
                     }
 
                         node = node->GetPrevious();
                     }


@@ -439,7 +415,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                         // this is the first button in the radio button group,
                         // it will be toggled automatically by GTK so bring the
                         // internal flag in sync
                         // this is the first button in the radio button group,
                         // it will be toggled automatically by GTK so bring the
                         // internal flag in sync

-                        tool->Toggle(TRUE);
+                        tool->Toggle(true);

                     }
                 }
 
                     }
                 }
 


@@ -463,9 +439,9 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 
                 if ( !tool->m_item )
                 {
 
                 if ( !tool->m_item )
                 {

-                    wxFAIL_MSG( _T("gtk_toolbar_insert_element() failed") );
+                    wxFAIL_MSG( wxT("gtk_toolbar_insert_element() failed") );

 
 

-                    return FALSE;
+                    return false;

                 }
 
                 gtk_signal_connect( GTK_OBJECT(tool->m_item),
                 }
 
                 gtk_signal_connect( GTK_OBJECT(tool->m_item),


@@ -483,7 +459,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
             gtk_toolbar_insert_space( m_toolbar, posGtk );
 
             // skip the rest
             gtk_toolbar_insert_space( m_toolbar, posGtk );
 
             // skip the rest

-            return TRUE;
+            return true;

 
         case wxTOOL_STYLE_CONTROL:
             gtk_toolbar_insert_widget(
 
         case wxTOOL_STYLE_CONTROL:
             gtk_toolbar_insert_widget(


@@ -503,7 +479,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
     m_height = req.height + 2*m_yMargin;
     InvalidateBestSize();
 
     m_height = req.height + 2*m_yMargin;
     InvalidateBestSize();
 

-    return TRUE;
+    return true;

 }
 
 bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 }
 
 bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)


@@ -513,18 +489,23 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
     switch ( tool->GetStyle() )
     {
         case wxTOOL_STYLE_CONTROL:
     switch ( tool->GetStyle() )
     {
         case wxTOOL_STYLE_CONTROL:

-            tool->GetControl()->Destroy();
+            // don't destroy the control here as we can be called from
+            // RemoveTool() and then we need to keep the control alive;
+            // while if we're called from DeleteTool() the control will
+            // be destroyed when wxToolBarToolBase itself is deleted

             break;
 
         case wxTOOL_STYLE_BUTTON:
             gtk_widget_destroy( tool->m_item );
             break;
 
             break;
 
         case wxTOOL_STYLE_BUTTON:
             gtk_widget_destroy( tool->m_item );
             break;
 

-        //case wxTOOL_STYLE_SEPARATOR: -- nothing to do
+        default:
+            wxFAIL_MSG( "unknown tool style" );
+            return false;

     }
 
     InvalidateBestSize();
     }
 
     InvalidateBestSize();

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -548,22 +529,13 @@ void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
     GtkWidget *item = tool->m_item;
     if ( item && GTK_IS_TOGGLE_BUTTON(item) )
     {
     GtkWidget *item = tool->m_item;
     if ( item && GTK_IS_TOGGLE_BUTTON(item) )
     {

-        wxBitmap bitmap = tool->GetBitmap();
-        if ( bitmap.Ok() )
-        {
-            GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
+        tool->SetPixmap(tool->GetBitmap());

 
 

-            GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
-                                               : (GdkBitmap *)NULL;
-
-            gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
-        }
-
-        m_blockEvent = TRUE;
+        m_blockEvent = true;

 
         gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle );
 
 
         gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle );
 

-        m_blockEvent = FALSE;
+        m_blockEvent = false;

     }
 }
 
     }
 }
 


@@ -571,7 +543,7 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool),
                             bool WXUNUSED(toggle))
 {
     // VZ: absolutely no idea about how to do it
                             bool WXUNUSED(toggle))
 {
     // VZ: absolutely no idea about how to do it

-    wxFAIL_MSG( _T("not implemented") );
+    wxFAIL_MSG( wxT("not implemented") );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -582,9 +554,9 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x),
                                                   wxCoord WXUNUSED(y)) const
 {
     // VZ: GTK+ doesn't seem to have such thing
                                                   wxCoord WXUNUSED(y)) const
 {
     // VZ: GTK+ doesn't seem to have such thing

-    wxFAIL_MSG( _T("wxToolBar::FindToolForPosition() not implemented") );
+    wxFAIL_MSG( wxT("wxToolBar::FindToolForPosition() not implemented") );

 
 

-    return (wxToolBarToolBase *)NULL;
+    return NULL;

 }
 
 void wxToolBar::SetMargins( int x, int y )
 }
 
 void wxToolBar::SetMargins( int x, int y )


@@ -592,10 +564,8 @@ void wxToolBar::SetMargins( int x, int y )
     wxCHECK_RET( GetToolsCount() == 0,
                  wxT("wxToolBar::SetMargins must be called before adding tools.") );
 
     wxCHECK_RET( GetToolsCount() == 0,
                  wxT("wxToolBar::SetMargins must be called before adding tools.") );
 

-#ifndef __WXGTK20__

     if (x > 1)
         gtk_toolbar_append_space( m_toolbar );  // oh well
     if (x > 1)
         gtk_toolbar_append_space( m_toolbar );  // oh well

-#endif

 
     m_xMargin = x;
     m_yMargin = y;
 
     m_xMargin = x;
     m_yMargin = y;


@@ -603,10 +573,7 @@ void wxToolBar::SetMargins( int x, int y )
 
 void wxToolBar::SetToolSeparation( int separation )
 {
 
 void wxToolBar::SetToolSeparation( int separation )
 {

-    // FIXME: this function disappeared
-#ifndef __WXGTK20__

     gtk_toolbar_set_space_size( m_toolbar, separation );
     gtk_toolbar_set_space_size( m_toolbar, separation );

-#endif

 
     m_toolSeparation = separation;
 }
 
     m_toolSeparation = separation;
 }


@@ -680,15 +647,11 @@ void wxToolBar::OnInternalIdle()
 wxVisualAttributes
 wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
 wxVisualAttributes
 wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {

-#ifdef __WXGTK20__
-    return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new);
-#else

     wxVisualAttributes attr;
     GtkWidget* widget = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
     attr = GetDefaultAttributesFromGTKWidget(widget);
     gtk_widget_destroy(widget);
     return attr;
     wxVisualAttributes attr;
     GtkWidget* widget = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
     attr = GetDefaultAttributesFromGTKWidget(widget);
     gtk_widget_destroy(widget);
     return attr;

-#endif

 }
 
 #endif // wxUSE_TOOLBAR_NATIVE
 }
 
 #endif // wxUSE_TOOLBAR_NATIVE