attempted Borland C++ compilation fix

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

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 4b44249b6eb6eb3755d8cd4da98744884536d883..af6e490dcabe9741196e0ad0cea2c733d2c19d91 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -78,6 +78,9 @@ static wxString FilterOutValue(const wxString& str);
 static wxString FilterInEntryName(const wxString& str);
 static wxString FilterOutEntryName(const wxString& str);
 
+// get the name to use in wxFileConfig ctor
+static wxString GetAppName(const wxString& appname);
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -198,9 +201,9 @@ void wxFileConfig::Init()
 wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
                            const wxString& strLocal, const wxString& strGlobal,
                            long style)
-            : wxConfigBase(!appName && wxTheApp ? wxTheApp->GetAppName()
-                                                : appName,
-                           vendorName, strLocal, strGlobal, style),
+            : wxConfigBase(::GetAppName(appName), vendorName,
+                           strLocal, strGlobal,
+                           style),
               m_strLocalFile(strLocal), m_strGlobalFile(strGlobal)
 {
   // Make up names for files if empty
@@ -1467,3 +1470,12 @@ static wxString FilterOutEntryName(const wxString& str)
   return strResult;
 }
 
+// we can't put ?: in the ctor initializer list because it confuses some
+// broken compilers (Borland C++)
+static wxString GetAppName(const wxString& appName)
+{
+    if ( !appName && wxTheApp )
+        return wxTheApp->GetAppName();
+    else
+        return appName;
+}