Remove duplicated typedef depending on header file version.

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

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index dc33f738419a99b694e0262c41eb8d2a5923dcd3..3c83e70c9832d40e49660cad4b0d96c7d0c2401c 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
 
@@ -25,16 +25,16 @@
 // wxRegConfig
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxRegConfig : public wxConfigBase
+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(""),
-              long style = 0);
+  wxRegConfig(const wxString& appName = wxEmptyString,
+              const wxString& vendorName = wxEmptyString,
+              const wxString& localFilename = wxEmptyString,
+              const wxString& globalFilename = wxEmptyString,
+              long style = wxCONFIG_USE_GLOBAL_FILE);
 
     // dtor will save unsaved data
   virtual ~wxRegConfig();
@@ -70,7 +70,7 @@ public:
   virtual bool RenameGroup(const wxString& oldName, const wxString& newName);
 
   // delete
-  virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso);
+  virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = TRUE);
   virtual bool DeleteGroup(const wxString& key);
   virtual bool DeleteAll();