Played a little with sockets.

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 0c7e7f13208846982f4c56f906520c43890f8cad..16a897245a916f16bec092a219860731fac5b790 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -12,49 +12,24 @@
 #endif
 
 #include "wx/toolbar.h"
 #endif
 
 #include "wx/toolbar.h"

+#include "wx/frame.h"

 
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------
 
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------

-// data
+// idle system

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

-extern bool   g_blockEventsOnDrag;
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;

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

-// wxToolBarTool
+// data

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

-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  )
-{
-    m_owner = owner;
-    m_index = theIndex;
-    m_bitmap1 = bitmap1;
-    m_bitmap2 = bitmap2;
-    m_isToggle = toggle;
-    m_enabled = TRUE;
-    m_toggleState = FALSE;
-    m_shortHelpString = shortHelpString;
-    m_longHelpString = longHelpString;
-    m_isMenuCommand = TRUE;
-    m_clientData = clientData;
-    m_deleteSecondBitmap = FALSE;
-    m_item = item;
-}
-
-wxToolBarTool::~wxToolBarTool()
-{
-}
+extern bool   g_blockEventsOnDrag;

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


@@ -62,6 +37,8 @@ wxToolBarTool::~wxToolBarTool()
 
 static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
 {
 
 static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
 {

+    if (g_isIdle) wxapp_install_idle_handler();
+

     if (g_blockEventsOnDrag) return;
     if (!tool->m_enabled) return;
 
     if (g_blockEventsOnDrag) return;
     if (!tool->m_enabled) return;
 


@@ -77,9 +54,61 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *to
 static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), 
   GdkEventCrossing *WXUNUSED(gdk_event), wxToolBarTool *tool )
 {
 static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), 
   GdkEventCrossing *WXUNUSED(gdk_event), wxToolBarTool *tool )
 {

+    if (g_isIdle) wxapp_install_idle_handler();
+

     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnDrag) return TRUE;

+    
+    /* we grey-out the tip text of disabled tool */
+    
+    wxToolBar *tb = tool->m_owner;
+    
+    if (tool->m_enabled)
+    {
+        if (tb->m_fg->red != 0)
+        {
+            tb->m_fg->red = 0;
+            tb->m_fg->green = 0;
+            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 );
+#endif
+        }
+    }
+    else
+    {
+        if (tb->m_fg->red == 0)
+        {
+            tb->m_fg->red = 33000;
+            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 );
+#endif
+        }
+    }
+    
+    /* emit the event */

   
   

-    tool->m_owner->OnMouseEnter( tool->m_index );
+    tb->OnMouseEnter( tool->m_index );

   
     return FALSE;
 }
   
     return FALSE;
 }


@@ -90,6 +119,10 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl)
 

+BEGIN_EVENT_TABLE(wxToolBar, wxControl)
+  EVT_IDLE(wxToolBar::OnIdle)
+END_EVENT_TABLE()
+

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


@@ -123,10 +156,29 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
     m_separation = 5;
     gtk_toolbar_set_space_size( m_toolbar, m_separation );
     m_hasToolAlready = FALSE;
     m_separation = 5;
     gtk_toolbar_set_space_size( m_toolbar, m_separation );
     m_hasToolAlready = FALSE;

-                                             
-    m_widget = GTK_WIDGET(m_toolbar);                                      
-                                           
+
+    if (style & wxTB_DOCKABLE)
+    {
+        m_widget = gtk_handle_box_new();
+        gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
+        gtk_widget_show( GTK_WIDGET(m_toolbar) );
+        
+#if (GTK_MINOR_VERSION > 0)
+        if (style & wxTB_FLAT)
+            gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(m_widget), GTK_SHADOW_NONE );
+#endif
+    }
+    else
+    {     
+        m_widget = GTK_WIDGET(m_toolbar);
+    }
+                                            

     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );

+    
+#if (GTK_MINOR_VERSION > 0)
+    if (style & wxTB_FLAT)
+        gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
+#endif

 
     m_fg = new GdkColor;
     m_fg->red = 0;
 
     m_fg = new GdkColor;
     m_fg->red = 0;


@@ -140,14 +192,24 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
     m_bg->blue = 50000;
     gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_bg );
   
     m_bg->blue = 50000;
     gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_bg );
   

+#if (GTK_MINOR_VERSION > 0)
+    gtk_tooltips_force_window( GTK_TOOLBAR(m_toolbar)->tooltips );
+
+    GtkStyle *g_style = 
+      gtk_style_copy(
+         gtk_widget_get_style( 
+            GTK_TOOLBAR(m_toolbar)->tooltips->tip_window ) );
+            
+    g_style->bg[GTK_STATE_NORMAL] = *m_bg;
+    gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
+#else

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

+#endif

 
     m_xMargin = 0;
     m_yMargin = 0;
     
 
     m_xMargin = 0;
     m_yMargin = 0;
     

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

   
     PostCreation();
 
   
     PostCreation();
 


@@ -194,17 +256,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,

-                 "invalid bitmap for wxToolBar icon" );
-
-    wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap,
-                                             toggle, clientData,
-                                             helpString1, helpString2 );
+                 _T("invalid bitmap for wxToolBar icon") );

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

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

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

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

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


@@ -218,6 +276,11 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
   
     gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
 
   
     gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
 

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

     GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON
                                        : GTK_TOOLBAR_CHILD_BUTTON;
 
     GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON
                                        : GTK_TOOLBAR_CHILD_BUTTON;
 


@@ -227,7 +290,7 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
                       ctype,
                       (GtkWidget *)NULL,
                       (const char *)NULL,
                       ctype,
                       (GtkWidget *)NULL,
                       (const char *)NULL,

-                      helpString1,
+                      helpString1.mbc_str(),

                       "",
                       tool_pixmap,
                       (GtkSignalFunc)gtk_toolbar_callback,
                       "",
                       tool_pixmap,
                       (GtkSignalFunc)gtk_toolbar_callback,


@@ -253,7 +316,7 @@ void wxToolBar::AddSeparator()
 
 void wxToolBar::ClearTools()
 {
 
 void wxToolBar::ClearTools()
 {

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

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


@@ -288,14 +351,22 @@ void wxToolBar::EnableTool(int toolIndex, bool enable)
     {
         wxToolBarTool *tool = (wxToolBarTool*)node->Data();
         if (tool->m_index == toolIndex)
     {
         wxToolBarTool *tool = (wxToolBarTool*)node->Data();
         if (tool->m_index == toolIndex)

-        { 
+        {

             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 (tool->m_item)
+                gtk_widget_set_sensitive( tool->m_item, enable );
+*/
+                

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

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

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


@@ -314,7 +385,7 @@ void wxToolBar::ToggleTool( int toolIndex, bool toggle )
         node = node->Next();
     }
   
         node = node->Next();
     }
   

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

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


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

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

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


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

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

   
     return FALSE;
 }
   
     return FALSE;
 }


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

-    wxFAIL_MSG( "wrong toolbar index" );
+    wxFAIL_MSG( _T("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, "wxToolBar::SetMargins must be called before adding tool." );
+    wxCHECK_RET( !m_hasToolAlready, _T("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
     


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

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

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


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

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

     
     

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

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


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

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

     
     

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

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


@@ -438,12 +509,12 @@ void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
         if (tool->m_index == toolIndex)
         { 
             tool->m_longHelpString = helpString;
         if (tool->m_index == toolIndex)
         { 
             tool->m_longHelpString = helpString;

-           return;
+            return;

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

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

     
     return;
 }
     
     return;
 }


@@ -457,14 +528,41 @@ void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString)
         if (tool->m_index == toolIndex)
         { 
             tool->m_shortHelpString = helpString;
         if (tool->m_index == toolIndex)
         { 
             tool->m_shortHelpString = helpString;

-           return;
+            return;

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

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

     
     return;
 }
 
     
     return;
 }
 

+void wxToolBar::OnIdle( wxIdleEvent &WXUNUSED(ievent) )
+{
+    wxEvtHandler* evtHandler = GetEventHandler();
+
+    wxNode* node = m_tools.First();
+    while (node)
+    {
+        wxToolBarTool* tool = (wxToolBarTool*) node->Data();
+
+        wxUpdateUIEvent event( tool->m_index );
+        event.SetEventObject(this);
+
+        if (evtHandler->ProcessEvent( event ))
+        {
+            if (event.GetSetEnabled())
+                EnableTool(tool->m_index, event.GetEnabled());
+            if (event.GetSetChecked())
+                ToggleTool(tool->m_index, event.GetChecked());
+/*
+            if (event.GetSetText())
+                // Set tooltip?
+*/
+        }
+
+        node = node->Next();
+    }
+}