rtti api mods added

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index d05f2cddfb1cd59895f7f3abf6eddcde7c43a8de..496fa626187dce81cf558a6168a1efa5c3d2215a 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -16,10 +16,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "tbargtk.h"
 #endif
 
     #pragma implementation "tbargtk.h"
 #endif
 

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

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


@@ -57,7 +60,13 @@ static void GetGtkStyle(long style,
 
     if ( style & wxTB_TEXT )
     {
 
     if ( style & wxTB_TEXT )
     {

-        *gtkStyle = style & wxTB_NOICONS ? GTK_TOOLBAR_TEXT : GTK_TOOLBAR_BOTH;
+        *gtkStyle = style & wxTB_NOICONS
+                        ? GTK_TOOLBAR_TEXT
+                        : (
+#ifdef __WXGTK20__
+                          style & wxTB_HORZ_LAYOUT ? GTK_TOOLBAR_BOTH_HORIZ :
+#endif // __WXGTK20__
+                          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?
     {


@@ -130,7 +139,7 @@ protected:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -278,7 +287,7 @@ bool wxToolBar::Create( wxWindow *parent,
 #ifdef __WXGTK20__
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
     GtkSetStyle();
 #ifdef __WXGTK20__
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
     GtkSetStyle();

-    
+

     // 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);
     // 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);


@@ -343,8 +352,6 @@ bool wxToolBar::Create( wxWindow *parent,
 
     g_style->bg[GTK_STATE_NORMAL] = *m_bg;
 
 
     g_style->bg[GTK_STATE_NORMAL] = *m_bg;
 

-    SET_STYLE_FONT(g_style, GtkGetDefaultGuiFont());
-

     gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
 
     m_parent->DoAddChild( this );
     gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
 
     m_parent->DoAddChild( this );


@@ -429,8 +436,10 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 
                 if ( tool->IsRadio() )
                 {
 
                 if ( tool->IsRadio() )
                 {

-                    wxToolBarToolsList::Node *node = pos ? m_tools.Item(pos - 1)
-                                                         : NULL;
+                    wxToolBarToolsList::compatibility_iterator node
+                        = wxToolBarToolsList::compatibility_iterator();
+                    if ( pos ) node = m_tools.Item(pos - 1);
+

                     while ( node )
                     {
                         wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
                     while ( node )
                     {
                         wxToolBarTool *tool = (wxToolBarTool *)node->GetData();


@@ -475,7 +484,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 
                     return FALSE;
                 }
 
                     return FALSE;
                 }

-                
+

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


@@ -656,7 +665,7 @@ void wxToolBar::OnInternalIdle()
             gdk_window_set_cursor( m_widget->window, cursor.GetCursor() );
         }
 
             gdk_window_set_cursor( m_widget->window, cursor.GetCursor() );
         }
 

-        wxToolBarToolsList::Node *node = m_tools.GetFirst();
+        wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();

         while ( node )
         {
             wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
         while ( node )
         {
             wxToolBarTool *tool = (wxToolBarTool *)node->GetData();


@@ -675,7 +684,8 @@ void wxToolBar::OnInternalIdle()
         }
     }
 
         }
     }
 

-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);

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