X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5d94b6381c900575c6c78f726eae38e1673c4bc..fe164c3e2ea5453896cd63a5440a26365daec1bc:/src/generic/tbarsmpl.cpp

diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp
index 054fc30003..51699c845c 100644
--- a/src/generic/tbarsmpl.cpp
+++ b/src/generic/tbarsmpl.cpp
@@ -5,8 +5,8 @@
 // Modified by: VZ on 14.12.99 during wxToolBarSimple reorganization
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_TOOLBAR_SIMPLE
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_SIMPLE
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
@@ -37,6 +37,7 @@
     #include "wx/dcmemory.h"
 #endif
 
+#include "wx/toolbar.h"
 #include "wx/tbarsmpl.h"
 
 // ----------------------------------------------------------------------------
@@ -78,17 +79,17 @@ public:
     wxCoord m_y;
     wxCoord m_width;
     wxCoord m_height;
+
+    DECLARE_NO_COPY_CLASS(wxToolBarToolSimple)
 };
 
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
-
-#if !defined(wxUSE_TOOLBAR_NATIVE) && !defined(__WXUNIVERSAL__)
-    #include "wx/toolbar.h"
+IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxControl)
 
+#if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
     IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple)
 #endif
 
@@ -277,7 +278,7 @@ bool wxToolBarSimple::Realize()
     int maxToolHeight = 0;
 
     // Find the maximum tool width and height
-    wxToolBarToolsList::Node *node = m_tools.GetFirst();
+    wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
     while ( node )
     {
         wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();
@@ -383,7 +384,7 @@ void wxToolBarSimple::OnPaint (wxPaintEvent& WXUNUSED(event))
         return;
     count++;
 
-    for ( wxToolBarToolsList::Node *node = m_tools.GetFirst();
+    for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
           node;
           node = node->GetNext() )
     {
@@ -652,7 +653,7 @@ void wxToolBarSimple::SetRows(int nRows)
 wxToolBarToolBase *wxToolBarSimple::FindToolForPosition(wxCoord x,
                                                         wxCoord y) const
 {
-    wxToolBarToolsList::Node *node = m_tools.GetFirst();
+    wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
     while (node)
     {
         wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();