Style listbox now shows current style

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index b46fe7af5fc468e567618c18c298ee33f5575258..cd573461e5e620b10fe57027042c5089d678e8c9 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tbargtk.cpp
+// Name:        src/gtk/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


@@ -19,23 +19,27 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_TOOLBAR_NATIVE
+

 #include "wx/toolbar.h"
 
 #include "wx/toolbar.h"
 

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

 
 

-#include "wx/frame.h"
+// FIXME: Use GtkImage instead of GtkPixmap. Use the new toolbar API for when gtk runtime is new enough?
+// Beware that the new and old toolbar API may not be mixed in usage.
+#include <gtk/gtkversion.h>
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif

 
 

-#include <glib.h>

 #include "wx/gtk/private.h"
 
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 
 #include "wx/gtk/private.h"
 
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 

-// idle system
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-

 // data
 extern bool       g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
 // data
 extern bool       g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;


@@ -200,7 +204,7 @@ static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget),
                                        GdkEventCrossing *gdk_event,
                                        wxToolBarTool *tool )
 {
                                        GdkEventCrossing *gdk_event,
                                        wxToolBarTool *tool )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    // don't need to install idle handler, its done from "event" signal

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


@@ -314,8 +318,6 @@ bool wxToolBar::Create( wxWindow *parent,
         gtk_widget_show(GTK_WIDGET(m_toolbar));
     }
 
         gtk_widget_show(GTK_WIDGET(m_toolbar));
     }
 

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

     // FIXME: there is no such function for toolbars in 2.0
 #if 0
     if (style & wxTB_FLAT)
     // FIXME: there is no such function for toolbars in 2.0
 #if 0
     if (style & wxTB_FLAT)


@@ -337,6 +339,7 @@ void wxToolBar::GtkSetStyle()
 
     gtk_toolbar_set_orientation(m_toolbar, orient);
     gtk_toolbar_set_style(m_toolbar, style);
 
     gtk_toolbar_set_orientation(m_toolbar, orient);
     gtk_toolbar_set_style(m_toolbar, style);

+    gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), !(style & wxTB_NO_TOOLTIPS) );

 }
 
 void wxToolBar::SetWindowStyleFlag( long style )
 }
 
 void wxToolBar::SetWindowStyleFlag( long style )


@@ -362,7 +365,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
             wxCHECK_MSG( bitmap.Ok(), false,
                          wxT("invalid bitmap for wxToolBar icon") );
 
             wxCHECK_MSG( bitmap.Ok(), false,
                          wxT("invalid bitmap for wxToolBar icon") );
 

-            wxCHECK_MSG( bitmap.GetBitmap() == NULL, false,
+            wxCHECK_MSG( bitmap.GetDepth() != 1, false,

                          wxT("wxToolBar doesn't support GdkBitmap") );
 
             wxCHECK_MSG( bitmap.GetPixmap() != NULL, false,
                          wxT("wxToolBar doesn't support GdkBitmap") );
 
             wxCHECK_MSG( bitmap.GetPixmap() != NULL, false,


@@ -603,6 +606,9 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
 
 void wxToolBar::OnInternalIdle()
 {
 
 void wxToolBar::OnInternalIdle()
 {

+    // Check if we have to show window now
+    if (GtkShowFromOnIdle()) return;
+    

     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;