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

Resolve '&&' ambiguity

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-11-13 10:57:49 +00:00
parent 717de46036
commit 0b44214c97
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/appbase.cpp
View File

@@ -177,11 +177,7 @@ bool wxAppConsoleBase::Initialize(int& argcOrig, wxChar **argvOrig)
#endif #endif
#ifndef __WXPALMOS__ #ifndef __WXPALMOS__
#if wxUSE_UNICODE
if ( m_appName.empty() && (bool) argv ) if ( m_appName.empty() && (bool) argv )
#else
if ( m_appName.empty() && argv )
#endif
{ {
// the application name is, by default, the name of its executable file // the application name is, by default, the name of its executable file
wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL); wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);

2
src/common/stdpbase.cpp
View File

@@ -53,7 +53,7 @@ wxStandardPathsBase& wxStandardPathsBase::Get()
wxString wxStandardPathsBase::GetExecutablePath() const wxString wxStandardPathsBase::GetExecutablePath() const
{ {
if ( !wxTheApp || !wxTheApp->argv ) if ( !wxTheApp || ! (bool) wxTheApp->argv )
return wxEmptyString; return wxEmptyString;
wxString argv0 = wxTheApp->argv[0]; wxString argv0 = wxTheApp->argv[0];