Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxStandardPaths and wxFileName in wxFileConfig resulting in big code simplification and cleanup but also in change of the default file locations under Windows (replaces patch 1620492)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-18 17:34:11 +00:00
parent e3b81044ee
commit 466e87bd8c
5 changed files with 132 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/fileconf.h
View File

@@ -20,6 +20,7 @@
#include "wx/textfile.h"
#include "wx/string.h"
#include "wx/confbase.h"
#include "wx/filename.h"
// ----------------------------------------------------------------------------
// wxFileConfig
@@ -111,8 +112,18 @@ public:
//
// where file is the basename of szFile, ext is its extension
// or .conf (Unix) or .ini (Win) if it has none
static wxString GetGlobalFileName(const wxString& file);
static wxString GetLocalFileName(const wxString& file);
static wxFileName GetGlobalFile(const wxString& szFile);
static wxFileName GetLocalFile(const wxString& szFile, int style = 0);
static wxString GetGlobalFileName(const wxString& szFile)
{
return GetGlobalFile(szFile).GetFullPath();
}
static wxString GetLocalFileName(const wxString& szFile, int style = 0)
{
return GetLocalFile(szFile, style).GetFullPath();
}
// ctor & dtor
// New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE or
@@ -190,7 +201,7 @@ protected:
private:
// GetXXXFileName helpers: return ('/' terminated) directory names
static wxString GetGlobalDir();
static wxString GetLocalDir();
static wxString GetLocalDir(int style = 0);
// common part of all ctors (assumes that m_str{Local|Global}File are already
// initialized
@@ -220,8 +231,8 @@ private:
wxFileConfigLineList *m_linesHead, // head of the linked list
*m_linesTail; // tail
wxString m_strLocalFile, // local file name passed to ctor
m_strGlobalFile; // global
wxFileName m_fnLocalFile, // local file name passed to ctor
m_fnGlobalFile; // global
wxString m_strPath; // current path (not '/' terminated)
wxFileConfigGroup *m_pRootGroup, // the top (unnamed) group