rtti api mods added

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 2832d625373a2f03468fc634ae82f0ec03996f75..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


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

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

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


@@ -433,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();


@@ -660,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();