diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h index 579350fa4f..26f1f2d31c 100644 --- a/include/wx/bookctrl.h +++ b/include/wx/bookctrl.h @@ -47,7 +47,7 @@ public: } wxBookCtrl(wxWindow *parent, - wxWindowID id, + wxWindowID winid, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -55,12 +55,12 @@ public: { Init(); - (void)Create(parent, id, pos, size, style, name); + (void)Create(parent, winid, pos, size, style, name); } // quasi ctor bool Create(wxWindow *parent, - wxWindowID id, + wxWindowID winid, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -195,9 +195,9 @@ protected: class WXDLLEXPORT wxBookCtrlEvent : public wxNotifyEvent { public: - wxBookCtrlEvent(wxEventType commandType = wxEVT_NULL, int id = 0, + wxBookCtrlEvent(wxEventType commandType = wxEVT_NULL, int winid = 0, int nSel = -1, int nOldSel = -1) - : wxNotifyEvent(commandType, id) + : wxNotifyEvent(commandType, winid) { m_nSel = nSel; m_nOldSel = nOldSel; diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h index 1f6a7311de..007ab2e4e4 100644 --- a/include/wx/generic/mdig.h +++ b/include/wx/generic/mdig.h @@ -45,7 +45,7 @@ class WXDLLEXPORT wxGenericMDIParentFrame: public wxFrame public: wxGenericMDIParentFrame(); wxGenericMDIParentFrame(wxWindow *parent, - wxWindowID id, + wxWindowID winid, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -54,7 +54,7 @@ public: ~wxGenericMDIParentFrame(); bool Create( wxWindow *parent, - wxWindowID id, + wxWindowID winid, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -118,7 +118,7 @@ class WXDLLEXPORT wxGenericMDIChildFrame: public wxPanel public: wxGenericMDIChildFrame(); wxGenericMDIChildFrame( wxGenericMDIParentFrame *parent, - wxWindowID id, + wxWindowID winid, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -127,7 +127,7 @@ public: virtual ~wxGenericMDIChildFrame(); bool Create( wxGenericMDIParentFrame *parent, - wxWindowID id, + wxWindowID winid, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -148,7 +148,7 @@ public: // no status bars virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1, long WXUNUSED(style) = 1, - wxWindowID WXUNUSED(id) = 1, + wxWindowID WXUNUSED(winid) = 1, const wxString& WXUNUSED(name) = wxEmptyString) { return (wxStatusBar*)NULL; } @@ -168,7 +168,7 @@ public: #if wxUSE_TOOLBAR // no toolbar bars virtual wxToolBar* CreateToolBar( long WXUNUSED(style), - wxWindowID WXUNUSED(id), + wxWindowID WXUNUSED(winid), const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; } virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; } @@ -276,13 +276,13 @@ class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame public: wxMDIParentFrame() {} wxMDIParentFrame(wxWindow *parent, - wxWindowID id, + wxWindowID winid, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, 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( wxGenericMDIParentFrame *parent, - wxWindowID id, + wxWindowID winid, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr ) - :wxGenericMDIChildFrame(parent, id, title, pos, size, style, name) + :wxGenericMDIChildFrame(parent, winid, title, pos, size, style, name) { } diff --git a/include/wx/notebook.h b/include/wx/notebook.h index 7d1f7cc5fc..1193881d11 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -56,12 +56,12 @@ public: wxNotebookBase() { } wxNotebookBase(wxWindow *parent, - wxWindowID id, + wxWindowID winid, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, 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 { public: - wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, + wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int winid = 0, 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&); -#define EVT_NOTEBOOK_PAGE_CHANGED(id, fn) \ +#define EVT_NOTEBOOK_PAGE_CHANGED(winid, fn) \ DECLARE_EVENT_TABLE_ENTRY( \ wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, \ - id, \ + winid, \ -1, \ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ NULL \ ), -#define EVT_NOTEBOOK_PAGE_CHANGING(id, fn) \ +#define EVT_NOTEBOOK_PAGE_CHANGING(winid, fn) \ DECLARE_EVENT_TABLE_ENTRY( \ wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \ - id, \ + winid, \ -1, \ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ NULL \