Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-10-27 03:47:39 +00:00
parent c5c5dad595
commit b935bec236
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/scrolwin.h
View File

@@ -45,20 +45,20 @@ class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel,
public: public:
wxGenericScrolledWindow() : wxScrollHelper(this) { } wxGenericScrolledWindow() : wxScrollHelper(this) { }
wxGenericScrolledWindow(wxWindow *parent, wxGenericScrolledWindow(wxWindow *parent,
wxWindowID id = -1, wxWindowID winid = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxScrolledWindowStyle, long style = wxScrolledWindowStyle,
const wxString& name = wxPanelNameStr) const wxString& name = wxPanelNameStr)
: wxScrollHelper(this) : wxScrollHelper(this)
{ {
Create(parent, id, pos, size, style, name); Create(parent, winid, pos, size, style, name);
} }
virtual ~wxGenericScrolledWindow(); virtual ~wxGenericScrolledWindow();
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID winid,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxScrolledWindowStyle, long style = wxScrolledWindowStyle,

4
include/wx/scrolwin.h
View File

@@ -219,12 +219,12 @@ protected:
public: public:
wxScrolledWindow() { } wxScrolledWindow() { }
wxScrolledWindow(wxWindow *parent, wxScrolledWindow(wxWindow *parent,
wxWindowID id = -1, wxWindowID winid = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxScrolledWindowStyle, long style = wxScrolledWindowStyle,
const wxString& name = wxPanelNameStr) const wxString& name = wxPanelNameStr)
: wxGenericScrolledWindow(parent, id, pos, size, style, name) : wxGenericScrolledWindow(parent, winid, pos, size, style, name)
{ {
} }