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

Replaced all occurences of id with winid for Objective-C++ compatibility

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-11-06 18:09:48 +00:00
parent 46c81560de
commit aa6f64c7d8
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/bookctrl.h
View File

@@ -47,7 +47,7 @@ public:
} }
wxBookCtrl(wxWindow *parent, wxBookCtrl(wxWindow *parent,
wxWindowID id, wxWindowID winid,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
@@ -55,12 +55,12 @@ public:
{ {
Init(); Init();
(void)Create(parent, id, pos, size, style, name); (void)Create(parent, winid, pos, size, style, name);
} }
// quasi ctor // quasi ctor
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 = 0, long style = 0,
@@ -195,9 +195,9 @@ protected:
class WXDLLEXPORT wxBookCtrlEvent : public wxNotifyEvent class WXDLLEXPORT wxBookCtrlEvent : public wxNotifyEvent
{ {
public: public:
wxBookCtrlEvent(wxEventType commandType = wxEVT_NULL, int id = 0, wxBookCtrlEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,
int nSel = -1, int nOldSel = -1) int nSel = -1, int nOldSel = -1)
: wxNotifyEvent(commandType, id) : wxNotifyEvent(commandType, winid)
{ {
m_nSel = nSel; m_nSel = nSel;
m_nOldSel = nOldSel; m_nOldSel = nOldSel;

20
include/wx/generic/mdig.h
View File

@@ -45,7 +45,7 @@ class WXDLLEXPORT wxGenericMDIParentFrame: public wxFrame
public: public:
wxGenericMDIParentFrame(); wxGenericMDIParentFrame();
wxGenericMDIParentFrame(wxWindow *parent, wxGenericMDIParentFrame(wxWindow *parent,
wxWindowID id, wxWindowID winid,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
@@ -54,7 +54,7 @@ public:
~wxGenericMDIParentFrame(); ~wxGenericMDIParentFrame();
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
wxWindowID id, wxWindowID winid,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
@@ -118,7 +118,7 @@ class WXDLLEXPORT wxGenericMDIChildFrame: public wxPanel
public: public:
wxGenericMDIChildFrame(); wxGenericMDIChildFrame();
wxGenericMDIChildFrame( wxGenericMDIParentFrame *parent, wxGenericMDIChildFrame( wxGenericMDIParentFrame *parent,
wxWindowID id, wxWindowID winid,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
@@ -127,7 +127,7 @@ public:
virtual ~wxGenericMDIChildFrame(); virtual ~wxGenericMDIChildFrame();
bool Create( wxGenericMDIParentFrame *parent, bool Create( wxGenericMDIParentFrame *parent,
wxWindowID id, wxWindowID winid,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
@@ -148,7 +148,7 @@ public:
// no status bars // no status bars
virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1, virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1,
long WXUNUSED(style) = 1, long WXUNUSED(style) = 1,
wxWindowID WXUNUSED(id) = 1, wxWindowID WXUNUSED(winid) = 1,
const wxString& WXUNUSED(name) = wxEmptyString) const wxString& WXUNUSED(name) = wxEmptyString)
{ return (wxStatusBar*)NULL; } { return (wxStatusBar*)NULL; }
@@ -168,7 +168,7 @@ public:
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
// no toolbar bars // no toolbar bars
virtual wxToolBar* CreateToolBar( long WXUNUSED(style), virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
wxWindowID WXUNUSED(id), wxWindowID WXUNUSED(winid),
const wxString& WXUNUSED(name) ) const wxString& WXUNUSED(name) )
{ return (wxToolBar*)NULL; } { return (wxToolBar*)NULL; }
virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; } virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
@@ -276,13 +276,13 @@ class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame
public: public:
wxMDIParentFrame() {} wxMDIParentFrame() {}
wxMDIParentFrame(wxWindow *parent, wxMDIParentFrame(wxWindow *parent,
wxWindowID id, wxWindowID winid,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr) const wxString& name = wxFrameNameStr)
:wxGenericMDIParentFrame(parent, id, title, pos, size, style, name) :wxGenericMDIParentFrame(parent, winid, title, pos, size, style, name)
{ {
} }
@@ -303,13 +303,13 @@ public:
wxMDIChildFrame() {} wxMDIChildFrame() {}
wxMDIChildFrame( wxGenericMDIParentFrame *parent, wxMDIChildFrame( wxGenericMDIParentFrame *parent,
wxWindowID id, wxWindowID winid,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr ) const wxString& name = wxFrameNameStr )
:wxGenericMDIChildFrame(parent, id, title, pos, size, style, name) :wxGenericMDIChildFrame(parent, winid, title, pos, size, style, name)
{ {
} }

16
include/wx/notebook.h
View File

@@ -56,12 +56,12 @@ public:
wxNotebookBase() { } wxNotebookBase() { }
wxNotebookBase(wxWindow *parent, wxNotebookBase(wxWindow *parent,
wxWindowID id, wxWindowID winid,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxNOTEBOOK_NAME) const wxString& name = wxNOTEBOOK_NAME)
: wxBookCtrl(parent, id, pos, size, style, name) : wxBookCtrl(parent, winid, pos, size, style, name)
{ {
} }
@@ -102,9 +102,9 @@ protected:
class WXDLLEXPORT wxNotebookEvent : public wxBookCtrlEvent class WXDLLEXPORT wxNotebookEvent : public wxBookCtrlEvent
{ {
public: public:
wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,
int nSel = -1, int nOldSel = -1) int nSel = -1, int nOldSel = -1)
: wxBookCtrlEvent(commandType, id, nSel, nOldSel) : wxBookCtrlEvent(commandType, winid, nSel, nOldSel)
{ {
} }
@@ -119,19 +119,19 @@ END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
#define EVT_NOTEBOOK_PAGE_CHANGED(id, fn) \ #define EVT_NOTEBOOK_PAGE_CHANGED(winid, fn) \
DECLARE_EVENT_TABLE_ENTRY( \ DECLARE_EVENT_TABLE_ENTRY( \
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, \ wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, \
id, \ winid, \
-1, \ -1, \
(wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \
NULL \ NULL \
), ),
#define EVT_NOTEBOOK_PAGE_CHANGING(id, fn) \ #define EVT_NOTEBOOK_PAGE_CHANGING(winid, fn) \
DECLARE_EVENT_TABLE_ENTRY( \ DECLARE_EVENT_TABLE_ENTRY( \
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \ wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \
id, \ winid, \
-1, \ -1, \
(wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \
NULL \ NULL \