added the makefile for tex2rtf compilation using configure, fixed compilation

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

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 9f82a552b5084789d5f8bc85980ded97c32da417..499cae0d70f94b6d967968ecae3ff8ed76f901a8 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -12,6 +12,9 @@
 #endif
 
 #include "wx/toolbar.h"
 #endif
 
 #include "wx/toolbar.h"

+
+#if wxUSE_TOOLBAR
+

 #include "wx/frame.h"
 
 #include "glib.h"
 #include "wx/frame.h"
 
 #include "glib.h"


@@ -29,7 +32,8 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
+extern bool       g_blockEventsOnDrag;
+extern wxCursor   g_globalCursor;

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


@@ -74,10 +78,11 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
 
     if (g_blockEventsOnDrag) return TRUE;
     
 
     if (g_blockEventsOnDrag) return TRUE;
     

-    /* we grey-out the tip text of disabled tool */

     
     wxToolBar *tb = tool->m_owner;
     
     
     wxToolBar *tb = tool->m_owner;
     

+#if (GTK_MINOR_VERSION == 0)
+    /* we grey-out the tip text of disabled tool in GTK 1.0 */

     if (tool->m_enabled)
     {
         if (tb->m_fg->red != 0)
     if (tool->m_enabled)
     {
         if (tb->m_fg->red != 0)


@@ -87,17 +92,7 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
             tb->m_fg->blue = 0;
             gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg );
             
             tb->m_fg->blue = 0;
             gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg );
             

-#if (GTK_MINOR_VERSION > 0)
-            GtkStyle *g_style = 
-              gtk_style_copy(
-                gtk_widget_get_style( 
-                   GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window ) );
-            
-            g_style->fg[GTK_STATE_NORMAL] = *tb->m_fg;
-            gtk_widget_set_style( GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window, g_style );
-#else

             gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg );
             gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg );

-#endif

         }
     }
     else
         }
     }
     else


@@ -108,19 +103,10 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
             tb->m_fg->green = 33000;
             tb->m_fg->blue = 33000;
             gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg );
             tb->m_fg->green = 33000;
             tb->m_fg->blue = 33000;
             gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg );

-#if (GTK_MINOR_VERSION > 0)
-            GtkStyle *g_style = 
-              gtk_style_copy(
-                gtk_widget_get_style( 
-                   GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window ) );
-            
-            g_style->fg[GTK_STATE_NORMAL] = *tb->m_fg;
-            gtk_widget_set_style( GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window, g_style );
-#else

             gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg );
             gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg );

-#endif

         }
     }
         }
     }

+#endif

     
     /* emit the event */
   
     
     /* emit the event */
   


@@ -162,7 +148,12 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
 {
     m_needParent = TRUE;
 
 {
     m_needParent = TRUE;
 

-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxToolBar creation failed") );
+       return FALSE;
+    }

 
     m_tools.DeleteContents( TRUE );
 
 
     m_tools.DeleteContents( TRUE );
 


@@ -272,13 +263,13 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
     m_hasToolAlready = TRUE;
     
     wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
     m_hasToolAlready = TRUE;
     
     wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,

-                 _T("invalid bitmap for wxToolBar icon") );
+                 wxT("invalid bitmap for wxToolBar icon") );

 
     wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,
 
     wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,

-                 _T("wxToolBar doesn't support GdkBitmap") );
+                 wxT("wxToolBar doesn't support GdkBitmap") );

 
     wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,
 
     wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,

-                 _T("wxToolBar::Add needs a wxBitmap") );
+                 wxT("wxToolBar::Add needs a wxBitmap") );

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


@@ -289,7 +280,10 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
       mask = bitmap.GetMask()->GetBitmap();
     
     tool_pixmap = gtk_pixmap_new( pixmap, mask );
       mask = bitmap.GetMask()->GetBitmap();
     
     tool_pixmap = gtk_pixmap_new( pixmap, mask );

-  
+#if (GTK_MINOR_VERSION > 0)
+    gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE );
+#endif
+    

     gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
 
     wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap,
     gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
 
     wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap,


@@ -315,6 +309,11 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
 
     tool->m_item = item;
 
 
     tool->m_item = item;
 

+    GtkRequisition req;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+    m_width = req.width;
+    m_height = req.height;
+

     gtk_signal_connect( GTK_OBJECT(tool->m_item),
                         "enter_notify_event", 
                         GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback),
     gtk_signal_connect( GTK_OBJECT(tool->m_item),
                         "enter_notify_event", 
                         GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback),


@@ -332,7 +331,7 @@ void wxToolBar::AddSeparator()
 
 void wxToolBar::ClearTools()
 {
 
 void wxToolBar::ClearTools()
 {

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

 }
 
 bool wxToolBar::Realize()
 }
 
 bool wxToolBar::Realize()


@@ -370,19 +369,19 @@ void wxToolBar::EnableTool(int toolIndex, bool enable)
         {
             tool->m_enabled = enable;
             
         {
             tool->m_enabled = enable;
             

-/*   we don't disable the tools for now as the bitmaps don't get
-     greyed anyway and this also disables tooltips
-
+#if (GTK_MINOR_VERSION > 0)
+            /* we don't disable the tools for GTK 1.0 as the bitmaps don't get
+               greyed anyway and this also disables tooltips */

             if (tool->m_item)
                 gtk_widget_set_sensitive( tool->m_item, enable );
             if (tool->m_item)
                 gtk_widget_set_sensitive( tool->m_item, enable );

-*/
+#endif

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

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

 }
 
 void wxToolBar::ToggleTool( int toolIndex, bool toggle ) 
 }
 
 void wxToolBar::ToggleTool( int toolIndex, bool toggle ) 


@@ -393,15 +392,38 @@ void wxToolBar::ToggleTool( int toolIndex, bool toggle )
         wxToolBarTool *tool = (wxToolBarTool*)node->Data();
         if (tool->m_index == toolIndex)
         { 
         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)))
             if ((tool->m_item) && (GTK_IS_TOGGLE_BUTTON(tool->m_item)))

+           {
+                tool->m_toggleState = toggle;
+               
+               if (tool->m_bitmap2.Ok())
+               {
+                   wxBitmap bitmap = tool->m_bitmap1;
+                   if (tool->m_toggleState) bitmap = tool->m_bitmap2;
+           
+                    GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
+           
+                    GdkBitmap *mask = (GdkBitmap *) NULL;
+                    if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
+  
+                    gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
+               }
+               
+                gtk_signal_disconnect_by_func( GTK_OBJECT(tool->m_item), 
+                  GTK_SIGNAL_FUNC(gtk_toolbar_callback), (gpointer*)tool );
+               

                 gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(tool->m_item), toggle );
                 gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(tool->m_item), toggle );

+               
+                gtk_signal_connect( GTK_OBJECT(tool->m_item), "clicked",
+                  GTK_SIGNAL_FUNC(gtk_toolbar_callback), (gpointer*)tool );
+           }
+

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

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

 }
 
 wxObject *wxToolBar::GetToolClientData( int index ) const
 }
 
 wxObject *wxToolBar::GetToolClientData( int index ) const


@@ -414,7 +436,7 @@ wxObject *wxToolBar::GetToolClientData( int index ) const
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

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


@@ -429,7 +451,7 @@ bool wxToolBar::GetToolState(int toolIndex) const
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

   
     return FALSE;
 }
   
     return FALSE;
 }


@@ -444,14 +466,14 @@ bool wxToolBar::GetToolEnabled(int toolIndex) const
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

   
     return FALSE;
 }
 
 void wxToolBar::SetMargins( int x, int y )
 {
   
     return FALSE;
 }
 
 void wxToolBar::SetMargins( int x, int y )
 {

-    wxCHECK_RET( !m_hasToolAlready, _T("wxToolBar::SetMargins must be called before adding tool.") );
+    wxCHECK_RET( !m_hasToolAlready, wxT("wxToolBar::SetMargins must be called before adding tool.") );

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


@@ -461,7 +483,7 @@ void wxToolBar::SetMargins( int x, int y )
 
 void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
 {
 
 void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
 {

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

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


@@ -493,9 +515,9 @@ wxString wxToolBar::GetToolLongHelp(int toolIndex)
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

     
     

-    return _T("");
+    return wxT("");

 }
 
 wxString wxToolBar::GetToolShortHelp(int toolIndex)
 }
 
 wxString wxToolBar::GetToolShortHelp(int toolIndex)


@@ -511,9 +533,9 @@ wxString wxToolBar::GetToolShortHelp(int toolIndex)
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

     
     

-    return _T("");
+    return wxT("");

 }
 
 void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
 }
 
 void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)


@@ -530,7 +552,7 @@ void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

     
     return;
 }
     
     return;
 }


@@ -549,7 +571,7 @@ void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString)
         node = node->Next();
     }
   
         node = node->Next();
     }
   

-    wxFAIL_MSG( _T("wrong toolbar index") );
+    wxFAIL_MSG( wxT("wrong toolbar index") );

     
     return;
 }
     
     return;
 }


@@ -582,3 +604,43 @@ void wxToolBar::OnIdle( wxIdleEvent &WXUNUSED(ievent) )
     }
 }
 
     }
 }
 

+void wxToolBar::OnInternalIdle()
+{
+    wxCursor cursor = m_cursor;
+    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+
+    if (cursor.Ok())
+    {
+        /* I now set the cursor the anew in every OnInternalIdle call
+          as setting the cursor in a parent window also effects the
+          windows above so that checking for the current cursor is
+          not possible. */
+          
+        if (HasFlag(wxTB_DOCKABLE))
+       {
+           /* if the toolbar is dockable, then m_widget stands for the
+              GtkHandleBox widget, which uses its own window so that we
+              can set the cursor for it. if the toolbar is not dockable,
+              m_widget comes from m_toolbar which uses its parent's
+              window ("windowless windows") and thus we cannot set the
+              cursor. */
+           gdk_window_set_cursor( m_widget->window, cursor.GetCursor() );
+       }
+       
+        wxNode *node = m_tools.First();
+       while (node)
+        {
+           wxToolBarTool *tool = (wxToolBarTool*)node->Data();
+           if (!tool->m_item->window)
+               break;
+           else
+               gdk_window_set_cursor( tool->m_item->window, cursor.GetCursor() );
+               
+           node = node->Next();
+        }
+    }
+
+    UpdateWindowUI();
+}
+
+#endif