Fix Intel compiler warnings about hiding member variables.
Rename method parameters to avoid conflicts with member variables names. Closes #15971. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -273,8 +273,8 @@ protected:
|
|||||||
struct wxEventProcessingData
|
struct wxEventProcessingData
|
||||||
{
|
{
|
||||||
wxEventProcessingData(const FILE_NOTIFY_INFORMATION* ne,
|
wxEventProcessingData(const FILE_NOTIFY_INFORMATION* ne,
|
||||||
const wxFSWatchEntryMSW* watch) :
|
const wxFSWatchEntryMSW* watch_) :
|
||||||
nativeEvent(ne), watch(watch)
|
nativeEvent(ne), watch(watch_)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
const FILE_NOTIFY_INFORMATION* nativeEvent;
|
const FILE_NOTIFY_INFORMATION* nativeEvent;
|
||||||
|
@@ -3074,10 +3074,10 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
|
|||||||
class RowToTreeNodeJob: public DoJob
|
class RowToTreeNodeJob: public DoJob
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
RowToTreeNodeJob( unsigned int row , int current, wxDataViewTreeNode * node )
|
RowToTreeNodeJob( unsigned int row_ , int current_, wxDataViewTreeNode * node )
|
||||||
{
|
{
|
||||||
this->row = row;
|
this->row = row_;
|
||||||
this->current = current;
|
this->current = current_;
|
||||||
ret = NULL;
|
ret = NULL;
|
||||||
parent = node;
|
parent = node;
|
||||||
}
|
}
|
||||||
|
@@ -630,9 +630,9 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
//// Initialize
|
//// 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;
|
return false;
|
||||||
|
|
||||||
// ensure that base cleanup is done if we return too early
|
// ensure that base cleanup is done if we return too early
|
||||||
|
@@ -233,8 +233,8 @@ private:
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
// Ctor takes ownership of the pointers.
|
// Ctor takes ownership of the pointers.
|
||||||
SystemDataEntry(FORMATETC *pformatetc, STGMEDIUM *pmedium)
|
SystemDataEntry(FORMATETC *pformatetc_, STGMEDIUM *pmedium_)
|
||||||
: pformatetc(pformatetc), pmedium(pmedium)
|
: pformatetc(pformatetc_), pmedium(pmedium_)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user