make it possible to give focus to the notebook itself (patch 811013)

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

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index dc33f738419a99b694e0262c41eb8d2a5923dcd3..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
 
 #ifndef   _REGCONF_H
 #define   _REGCONF_H
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "regconf.h"
 #endif
 
 #pragma interface "regconf.h"
 #endif
 


@@ -25,15 +25,15 @@
 // wxRegConfig
 // ----------------------------------------------------------------------------
 
 // wxRegConfig
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxRegConfig : public wxConfigBase
+class WXDLLIMPEXP_BASE wxRegConfig : public wxConfigBase

 {
 public:
   // ctor & dtor
     // will store data in HKLM\appName and HKCU\appName
 {
 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
               long style = 0);
 
     // dtor will save unsaved data


@@ -70,7 +70,7 @@ public:
   virtual bool RenameGroup(const wxString& oldName, const wxString& newName);
 
   // delete
   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();
 
   virtual bool DeleteGroup(const wxString& key);
   virtual bool DeleteAll();