diff --git a/include/wx/msw/private/fswatcher.h b/include/wx/msw/private/fswatcher.h index fdbeef68a3..1442432a35 100644 --- a/include/wx/msw/private/fswatcher.h +++ b/include/wx/msw/private/fswatcher.h @@ -273,8 +273,8 @@ protected: struct wxEventProcessingData { wxEventProcessingData(const FILE_NOTIFY_INFORMATION* ne, - const wxFSWatchEntryMSW* watch) : - nativeEvent(ne), watch(watch) + const wxFSWatchEntryMSW* watch_) : + nativeEvent(ne), watch(watch_) {} const FILE_NOTIFY_INFORMATION* nativeEvent; diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 32f781d7c7..aee2652228 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -3074,10 +3074,10 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const class RowToTreeNodeJob: public DoJob { public: - RowToTreeNodeJob( unsigned int row , int current, wxDataViewTreeNode * node ) + RowToTreeNodeJob( unsigned int row_ , int current_, wxDataViewTreeNode * node ) { - this->row = row; - this->current = current; + this->row = row_; + this->current = current_; ret = NULL; parent = node; } diff --git a/src/msw/app.cpp b/src/msw/app.cpp index ae5937c287..c8df19115c 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -630,9 +630,9 @@ private: }; //// Initialize -bool wxApp::Initialize(int& argc, wxChar **argv) +bool wxApp::Initialize(int& argc_, wxChar **argv_) { - if ( !wxAppBase::Initialize(argc, argv) ) + if ( !wxAppBase::Initialize(argc_, argv_) ) return false; // ensure that base cleanup is done if we return too early diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index 097a576311..75aace6905 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -233,8 +233,8 @@ private: { public: // Ctor takes ownership of the pointers. - SystemDataEntry(FORMATETC *pformatetc, STGMEDIUM *pmedium) - : pformatetc(pformatetc), pmedium(pmedium) + SystemDataEntry(FORMATETC *pformatetc_, STGMEDIUM *pmedium_) + : pformatetc(pformatetc_), pmedium(pmedium_) { }