Applied patch [ 832096 ] Final separation for GUI and console for Open Watcom

[wxWidgets.git] / include / wx / msw / regconf.h

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index 3a1bca89a1b334330cf96b6271d1cf4a24e13ca2..666547a35d07368923a30397dae51ed284f0bde5 100644 (file)
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -12,7 +12,7 @@
 #ifndef   _REGCONF_H
 #define   _REGCONF_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "regconf.h"
 #endif
 
@@ -30,10 +30,10 @@ class WXDLLIMPEXP_BASE wxRegConfig : public wxConfigBase
 public:
   // ctor & dtor
     // will store data in HKLM\appName and HKCU\appName
-  wxRegConfig(const wxString& appName = _T(""),
-              const wxString& vendorName = _T(""),
-              const wxString& localFilename = _T(""),
-              const wxString& globalFilename = _T(""),
+  wxRegConfig(const wxString& appName = wxEmptyString,
+              const wxString& vendorName = wxEmptyString,
+              const wxString& localFilename = wxEmptyString,
+              const wxString& globalFilename = wxEmptyString,
               long style = 0);
 
     // dtor will save unsaved data