From b935bec2368afde72a9451fd431c8039b1194f1f Mon Sep 17 00:00:00 2001 From: David Elliott Date: Mon, 27 Oct 2003 03:47:39 +0000 Subject: [PATCH] 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 --- include/wx/generic/scrolwin.h | 6 +++--- include/wx/scrolwin.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h index 73ba89b9bc..faf66d635a 100644 --- a/include/wx/generic/scrolwin.h +++ b/include/wx/generic/scrolwin.h @@ -45,20 +45,20 @@ class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel, public: wxGenericScrolledWindow() : wxScrollHelper(this) { } wxGenericScrolledWindow(wxWindow *parent, - wxWindowID id = -1, + wxWindowID winid = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxScrolledWindowStyle, const wxString& name = wxPanelNameStr) : wxScrollHelper(this) { - Create(parent, id, pos, size, style, name); + Create(parent, winid, pos, size, style, name); } virtual ~wxGenericScrolledWindow(); bool Create(wxWindow *parent, - wxWindowID id, + wxWindowID winid, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxScrolledWindowStyle, diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index 72c158d392..9ebdc14f1b 100644 --- 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) { } -- 2.45.2