update to make digitalmars compile

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 6b49e4b4dfb17c4f88a75e1a13588078391a292d..ad52e6f0c638865db078054f8fddb0c40ab72db0 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -15,7 +15,7 @@
 #include "wx/tbarbase.h"     // the base class for all toolbars
 
 #if wxUSE_TOOLBAR
 #include "wx/tbarbase.h"     // the base class for all toolbars
 
 #if wxUSE_TOOLBAR

-    #if !wxUSE_TOOLBAR_NATIVE
+    #if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)

         #include "wx/tbarsmpl.h"
 
         class WXDLLEXPORT wxToolBar : public wxToolBarSimple
         #include "wx/tbarsmpl.h"
 
         class WXDLLEXPORT wxToolBar : public wxToolBarSimple


@@ -24,27 +24,27 @@
             wxToolBar() { }
 
             wxToolBar(wxWindow *parent,
             wxToolBar() { }
 
             wxToolBar(wxWindow *parent,

-                      wxWindowID id,
+                      wxWindowID winid,

                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = wxNO_BORDER | wxTB_HORIZONTAL,
                       const wxString& name = wxToolBarNameStr)
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = wxNO_BORDER | wxTB_HORIZONTAL,
                       const wxString& name = wxToolBarNameStr)

-                : wxToolBarSimple(parent, id, pos, size, style, name) { }
+                : wxToolBarSimple(parent, winid, pos, size, style, name) { }

 
             // the most commonly used version of AddTool()
 
             // the most commonly used version of AddTool()

-            wxToolBarToolBase *AddTool(int id,
+            wxToolBarToolBase *AddTool(int toolid,

                                const wxBitmap& bitmap,
                                const wxString& shortHelpString = wxEmptyString,
                                const wxString& longHelpString = wxEmptyString)
             {
                                const wxBitmap& bitmap,
                                const wxString& shortHelpString = wxEmptyString,
                                const wxString& longHelpString = wxEmptyString)
             {

-                return wxToolBarSimple::AddTool(id, bitmap, wxNullBitmap, FALSE, -1, -1, NULL,
+                return wxToolBarSimple::AddTool(toolid, bitmap, wxNullBitmap, FALSE, -1, -1, NULL,

                        shortHelpString, longHelpString);
             }
                        shortHelpString, longHelpString);
             }

-            
+

             // old form
             wxToolBarToolBase *AddTool
                                (
             // old form
             wxToolBarToolBase *AddTool
                                (

-                                   int id,
+                                   int toolid,

                                    const wxBitmap& bitmap,
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,
                                    const wxBitmap& bitmap,
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,


@@ -53,14 +53,14 @@
                                    const wxString& longHelpString = wxEmptyString
                                )
             {
                                    const wxString& longHelpString = wxEmptyString
                                )
             {

-                return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, -1, -1, clientData,
+                return wxToolBarSimple::AddTool(toolid, bitmap, pushedBitmap, toggle, -1, -1, clientData,

                        shortHelpString, longHelpString);
             }
                        shortHelpString, longHelpString);
             }

-            
+

             // virtual overridden
             virtual wxToolBarToolBase *AddTool
                                (
             // virtual overridden
             virtual wxToolBarToolBase *AddTool
                                (

-                                   int id,
+                                   int toolid,

                                    const wxBitmap& bitmap,
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,
                                    const wxBitmap& bitmap,
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,


@@ -71,10 +71,10 @@
                                    const wxString& longHelpString = wxEmptyString
                                )
             {
                                    const wxString& longHelpString = wxEmptyString
                                )
             {

-                return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, xPos, yPos, clientData,
+                return wxToolBarSimple::AddTool(toolid, bitmap, pushedBitmap, toggle, xPos, yPos, clientData,

                        shortHelpString, longHelpString);
             }
                        shortHelpString, longHelpString);
             }

-            
+

         private:
             DECLARE_DYNAMIC_CLASS(wxToolBar)
         };
         private:
             DECLARE_DYNAMIC_CLASS(wxToolBar)
         };


@@ -93,8 +93,6 @@
            #include "wx/mac/toolbar.h"
         #elif defined(__WXPM__)
            #include "wx/os2/toolbar.h"
            #include "wx/mac/toolbar.h"
         #elif defined(__WXPM__)
            #include "wx/os2/toolbar.h"

-        #elif defined(__WXSTUBS__)
-           #include "wx/stubs/toolbar.h"

         #endif
     #endif // !wxUSE_TOOLBAR_NATIVE/wxUSE_TOOLBAR_NATIVE
 #endif // wxUSE_TOOLBAR
         #endif
     #endif // !wxUSE_TOOLBAR_NATIVE/wxUSE_TOOLBAR_NATIVE
 #endif // wxUSE_TOOLBAR