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

Hidden variable warning fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-03-24 12:27:45 +00:00
parent 5f60a273bd
commit 3ee937aad0
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/x11/app.cpp
View File

@@ -90,7 +90,7 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
EVT_IDLE(wxAppBase::OnIdle) EVT_IDLE(wxAppBase::OnIdle)
END_EVENT_TABLE() END_EVENT_TABLE()
bool wxApp::Initialize(int& argc, wxChar **argv) bool wxApp::Initialize(int& argC, wxChar **argV)
{ {
#if defined(__WXDEBUG__) && !wxUSE_NANOX #if defined(__WXDEBUG__) && !wxUSE_NANOX
// install the X error handler // install the X error handler
@@ -100,66 +100,66 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
wxString displayName; wxString displayName;
bool syncDisplay = false; bool syncDisplay = false;
int argcOrig = argc; int argCOrig = argC;
for ( int i = 0; i < argcOrig; i++ ) for ( int i = 0; i < argCOrig; i++ )
{ {
if (wxStrcmp( argv[i], _T("-display") ) == 0) if (wxStrcmp( argV[i], _T("-display") ) == 0)
{ {
if (i < (argc - 1)) if (i < (argC - 1))
{ {
argv[i++] = NULL; argV[i++] = NULL;
displayName = argv[i]; displayName = argV[i];
argv[i] = NULL; argV[i] = NULL;
argc -= 2; argC -= 2;
} }
} }
else if (wxStrcmp( argv[i], _T("-geometry") ) == 0) else if (wxStrcmp( argV[i], _T("-geometry") ) == 0)
{ {
if (i < (argc - 1)) if (i < (argC - 1))
{ {
argv[i++] = NULL; argV[i++] = NULL;
int w, h; int w, h;
if (wxSscanf(argv[i], _T("%dx%d"), &w, &h) != 2) if (wxSscanf(argV[i], _T("%dx%d"), &w, &h) != 2)
{ {
wxLogError( _("Invalid geometry specification '%s'"), wxLogError( _("Invalid geometry specification '%s'"),
wxString(argv[i]).c_str() ); wxString(argV[i]).c_str() );
} }
else else
{ {
g_initialSize = wxSize(w, h); g_initialSize = wxSize(w, h);
} }
argv[i] = NULL; argV[i] = NULL;
argc -= 2; argC -= 2;
} }
} }
else if (wxStrcmp( argv[i], _T("-sync") ) == 0) else if (wxStrcmp( argV[i], _T("-sync") ) == 0)
{ {
syncDisplay = true; syncDisplay = true;
argv[i] = NULL; argV[i] = NULL;
argc--; argC--;
} }
else if (wxStrcmp( argv[i], _T("-iconic") ) == 0) else if (wxStrcmp( argV[i], _T("-iconic") ) == 0)
{ {
g_showIconic = true; g_showIconic = true;
argv[i] = NULL; argV[i] = NULL;
argc--; argC--;
} }
} }
if ( argc != argcOrig ) if ( argC != argCOrig )
{ {
// remove the argumens we consumed // remove the argumens we consumed
for ( int i = 0; i < argc; i++ ) for ( int i = 0; i < argC; i++ )
{ {
while ( !argv[i] ) while ( !argV[i] )
{ {
memmove(argv + i, argv + i + 1, argcOrig - i); memmove(argV + i, argV + i + 1, argCOrig - i);
} }
} }
} }
@@ -186,7 +186,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
// Misc. // Misc.
wxSetDetectableAutoRepeat( true ); wxSetDetectableAutoRepeat( true );
if ( !wxAppBase::Initialize(argc, argv) ) if ( !wxAppBase::Initialize(argC, argV) )
{ {
XCloseDisplay(xdisplay); XCloseDisplay(xdisplay);