Resolve '&&' ambiguity

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 738d2f311a81fdf56f523111e35836e983bbffdb..27fa04d6b3fd58af6cebe62d0d21151c072a9b01 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -177,11 +177,7 @@ bool wxAppConsoleBase::Initialize(int& argcOrig, wxChar **argvOrig)
 #endif
 
 #ifndef __WXPALMOS__
-#if wxUSE_UNICODE
     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
         wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);

diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index 6d0609e118d33dd4eaa2786bd21c0c195ea76c68..198486075d18ad2ebb09946036dc353f84862c10 100644 (file)
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -53,7 +53,7 @@ wxStandardPathsBase& wxStandardPathsBase::Get()
 
 wxString wxStandardPathsBase::GetExecutablePath() const
 {
-    if ( !wxTheApp || !wxTheApp->argv )
+    if ( !wxTheApp || ! (bool) wxTheApp->argv )
         return wxEmptyString;
 
     wxString argv0 = wxTheApp->argv[0];