some changes to make wxHtmlHelpController easier to subclass

[wxWidgets.git] / include / wx / fileconf.h

diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index c4712f714795de2e3aca278850ddf4c9582ce69b..f6c4718919e90e72e38315e78574cab3cb9c4f01 100644 (file)
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -18,17 +18,11 @@
 #endif
 
 #include "wx/defs.h"
-#include "wx/textfile.h"
-#include "wx/string.h"
 
-// ----------------------------------------------------------------------------
-// compile options
-// ----------------------------------------------------------------------------
+#if wxUSE_CONFIG
 
-// it won't compile without it anyhow
-#ifndef wxUSE_CONFIG
-  #error "Please define wxUSE_CONFIG or remove fileconf.cpp from your makefile"
-#endif // wxUSE_CONFIG
+#include "wx/textfile.h"
+#include "wx/string.h"
 
 // ----------------------------------------------------------------------------
 // wxFileConfig
@@ -140,29 +134,16 @@ public:
   //
   // where file is the basename of szFile, ext is it's extension
   // or .conf (Unix) or .ini (Win) if it has none
-  static wxString GetGlobalFileName(const char *szFile);
-  static wxString GetLocalFileName(const char *szFile);
+  static wxString GetGlobalFileName(const wxChar *szFile);
+  static wxString GetLocalFileName(const wxChar *szFile);
 
   // ctor & dtor
-
-#if 0
-    // the names of local and global (if not disabled) config files are
-    // constructed using Get{Local|Global}FileName functions described above
-    // (szAppName is just the (short) name of your application)
-  wxFileConfig(const char *szAppName, bool bLocalOnly = FALSE);
-    // this ctor allows you to specify custom names for both files (if strGlobal
-    // isn't a full path, it's considered to be relative to the standard
-    // directory, i.e. /etc under Unix and %windir% under Windows, if strLocal
-    // is not an absolute path, it's considered to be relative to the user's
-    // directory). If either of strings is empty, the corresponding file is not
-    // used.
-  wxFileConfig(const wxString& strLocal, const wxString& strGlobal);
-#endif
-
-   // New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE
-   // or wxCONFIG_USE_GLOBAL_FILE to say which files should be used.
-  wxFileConfig(const wxString& appName, const wxString& vendorName = "",
-               const wxString& localFilename = "", const wxString& globalFilename = "",
+    // New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE or
+    // wxCONFIG_USE_GLOBAL_FILE to say which files should be used.
+  wxFileConfig(const wxString& appName,
+               const wxString& vendorName = _T(""),
+               const wxString& localFilename = _T(""),
+               const wxString& globalFilename = _T(""),
                long style = wxCONFIG_USE_LOCAL_FILE);
 
     // dtor will save unsaved data
@@ -331,12 +312,12 @@ public:
   bool  IsEmpty() const { return Entries().IsEmpty() && Groups().IsEmpty(); }
 
   // find entry/subgroup (NULL if not found)
-  ConfigGroup *FindSubgroup(const char *szName) const;
-  ConfigEntry *FindEntry   (const char *szName) const;
+  ConfigGroup *FindSubgroup(const wxChar *szName) const;
+  ConfigEntry *FindEntry   (const wxChar *szName) const;
 
   // delete entry/subgroup, return FALSE if doesn't exist
-  bool DeleteSubgroupByName(const char *szName);
-  bool DeleteEntry(const char *szName);
+  bool DeleteSubgroupByName(const wxChar *szName);
+  bool DeleteEntry(const wxChar *szName);
 
   // create new entry/subgroup returning pointer to newly created element
   ConfigGroup *AddSubgroup(const wxString& strName);
@@ -362,5 +343,9 @@ public:
   void SetLastGroup(ConfigGroup *pGroup) { m_pLastGroup = pGroup; }
 };
 
-#endif  //_FILECONF_H
+#endif
+  // wxUSE_CONFIG
+
+#endif  
+  //_FILECONF_H