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@24323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-10-27 04:12:45 +00:00
parent b935bec236
commit 921176c5e4
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/generic/listctrl.h
View File

@@ -67,19 +67,19 @@ class WXDLLEXPORT wxGenericListCtrl: public wxControl
public: public:
wxGenericListCtrl(); wxGenericListCtrl();
wxGenericListCtrl( wxWindow *parent, wxGenericListCtrl( 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 = wxLC_ICON, long style = wxLC_ICON,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString &name = wxT("listctrl") ) const wxString &name = wxT("listctrl") )
{ {
Create(parent, id, pos, size, style, validator, name); Create(parent, winid, pos, size, style, validator, name);
} }
~wxGenericListCtrl(); ~wxGenericListCtrl();
bool Create( wxWindow *parent, bool Create( 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 = wxLC_ICON, long style = wxLC_ICON,
@@ -253,13 +253,13 @@ class WXDLLEXPORT wxListCtrl: public wxGenericListCtrl
public: public:
wxListCtrl() {} wxListCtrl() {}
wxListCtrl(wxWindow *parent, wxWindowID id = -1, wxListCtrl(wxWindow *parent, wxWindowID winid = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxLC_ICON, long style = wxLC_ICON,
const wxValidator &validator = wxDefaultValidator, const wxValidator &validator = wxDefaultValidator,
const wxString &name = wxT("listctrl") ) const wxString &name = wxT("listctrl") )
: wxGenericListCtrl(parent, id, pos, size, style, validator, name) : wxGenericListCtrl(parent, winid, pos, size, style, validator, name)
{ {
} }
}; };

4
include/wx/listbase.h
View File

@@ -342,8 +342,8 @@ private:
class WXDLLEXPORT wxListEvent : public wxNotifyEvent class WXDLLEXPORT wxListEvent : public wxNotifyEvent
{ {
public: public:
wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0) wxListEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)
: wxNotifyEvent(commandType, id) : wxNotifyEvent(commandType, winid)
, m_code(0) , m_code(0)
, m_oldItemIndex(0) , m_oldItemIndex(0)
, m_itemIndex(0) , m_itemIndex(0)

4
include/wx/listctrl.h
View File

@@ -39,14 +39,14 @@ class WXDLLEXPORT wxListView : public wxListCtrl
public: public:
wxListView() { } wxListView() { }
wxListView( wxWindow *parent, wxListView( 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 = wxLC_REPORT, long style = wxLC_REPORT,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString &name = wxT("listctrl") ) const wxString &name = wxT("listctrl") )
{ {
Create(parent, id, pos, size, style, validator, name); Create(parent, winid, pos, size, style, validator, name);
} }
// focus/selection stuff // focus/selection stuff