Changed all symbols with the name "id" to "winid" to allow Objective-C++

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-27 03:47:39 +00:00
parent c5c5dad595
commit b935bec236
2 changed files with 5 additions and 5 deletions
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -219,12 +219,12 @@ protected:
    public:
        wxScrolledWindow() { }
        wxScrolledWindow(wxWindow *parent,
-                         wxWindowID id = -1,
+                         wxWindowID winid = -1,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxScrolledWindowStyle,
                         const wxString& name = wxPanelNameStr)
-            : wxGenericScrolledWindow(parent, id, pos, size, style, name)
+            : wxGenericScrolledWindow(parent, winid, pos, size, style, name)
        {
        }