From 717de46036ff913de0f5c5cbb1d0fd0bb03f4c3a Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 13 Nov 2007 10:55:42 +0000
Subject: [PATCH] Resolve '&&' ambiguity (VC++ 6)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/appbase.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 66297871a4..738d2f311a 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -177,7 +177,11 @@ 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);
-- 
2.45.2