made wx[Array]TreeItemId[s] more backwards compatible

[wxWidgets.git] / include / wx / tbarsmpl.h

diff --git a/include/wx/tbarsmpl.h b/include/wx/tbarsmpl.h
index 3dbeac1ae7dec3d25565067542fde69c40edc8b1..7d689840228221383a3f7a6ccce869c5c9616469 100644 (file)
--- a/include/wx/tbarsmpl.h
+++ b/include/wx/tbarsmpl.h
@@ -5,7 +5,7 @@
 // Modified by: VZ on 14.12.99 during wxToolBar classes reorganization
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -18,7 +18,7 @@
 
 #include "wx/tbarbase.h"
 
-#if wxUSE_TOOLBAR_SIMPLE
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_SIMPLE
 
 class WXDLLEXPORT wxMemoryDC;
 
@@ -33,7 +33,7 @@ public:
     wxToolBarSimple() { Init(); }
 
     wxToolBarSimple(wxWindow *parent,
-                    wxWindowID id,
+                    wxWindowID winid,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxNO_BORDER | wxTB_HORIZONTAL,
@@ -41,11 +41,11 @@ public:
     {
         Init();
 
-        Create(parent, id, pos, size, style, name);
+        Create(parent, winid, pos, size, style, name);
     }
 
     bool Create(wxWindow *parent,
-                wxWindowID id,
+                wxWindowID winid,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxNO_BORDER | wxTB_HORIZONTAL,
@@ -108,7 +108,7 @@ protected:
     // implement base class pure virtuals
     virtual wxToolBarToolBase *DoAddTool
                                (
-                                   int id,
+                                   int toolid,
                                    const wxString& label,
                                    const wxBitmap& bitmap,
                                    const wxBitmap& bmpDisabled,
@@ -127,7 +127,7 @@ protected:
     virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
-    virtual wxToolBarToolBase *CreateTool(int id,
+    virtual wxToolBarToolBase *CreateTool(int winid,
                                           const wxString& label,
                                           const wxBitmap& bmpNormal,
                                           const wxBitmap& bmpDisabled,