Resolve '&&' ambiguity (VC++ 6)

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 66297871a4375928766f395b6ed7bb024a8b29ec..738d2f311a81fdf56f523111e35836e983bbffdb 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -177,7 +177,11 @@ bool wxAppConsoleBase::Initialize(int& argcOrig, wxChar **argvOrig)
 #endif
 
 #ifndef __WXPALMOS__
 #endif
 
 #ifndef __WXPALMOS__

+#if wxUSE_UNICODE
+    if ( m_appName.empty() && (bool) argv )
+#else

     if ( m_appName.empty() && argv )
     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);
     {
         // the application name is, by default, the name of its executable file
         wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);