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

Reverted config/resource name change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-05-26 10:49:43 +00:00
parent fc57ba5476
commit e7d9c39867
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/fmappriv.h
View File

@@ -25,7 +25,7 @@ enum { wxFONTENCODING_UNKNOWN = -2 };
// the config paths we use // the config paths we use
#if wxUSE_CONFIG #if wxUSE_CONFIG
#define FONTMAPPER_ROOT_PATH wxT("/wxWidgets/FontMapper") #define FONTMAPPER_ROOT_PATH wxT("/wxWindows/FontMapper")
#define FONTMAPPER_CHARSET_PATH wxT("Charsets") #define FONTMAPPER_CHARSET_PATH wxT("Charsets")
#define FONTMAPPER_CHARSET_ALIAS_PATH wxT("Aliases") #define FONTMAPPER_CHARSET_ALIAS_PATH wxT("Aliases")

8
src/generic/filedlgg.cpp
View File

@@ -873,9 +873,9 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
if (wxConfig::Get(FALSE)) if (wxConfig::Get(FALSE))
{ {
wxConfig::Get()->Read(wxT("/wxWidgets/wxFileDialog/ViewStyle"), wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
&ms_lastViewStyle); &ms_lastViewStyle);
wxConfig::Get()->Read(wxT("/wxWidgets/wxFileDialog/ShowHidden"), wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
&ms_lastShowHidden); &ms_lastShowHidden);
} }
@@ -1037,9 +1037,9 @@ wxGenericFileDialog::~wxGenericFileDialog()
{ {
if (wxConfig::Get(FALSE)) if (wxConfig::Get(FALSE))
{ {
wxConfig::Get()->Write(wxT("/wxWidgets/wxFileDialog/ViewStyle"), wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
ms_lastViewStyle); ms_lastViewStyle);
wxConfig::Get()->Write(wxT("/wxWidgets/wxFileDialog/ShowHidden"), wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
ms_lastShowHidden); ms_lastShowHidden);
} }

4
src/gtk/utilsres.cpp
View File

@@ -28,7 +28,7 @@
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file ) bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
{ {
wxString filename( file ); wxString filename( file );
if (filename.IsEmpty()) filename = wxT(".wxWidgets"); if (filename.IsEmpty()) filename = wxT(".wxWindows");
wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename ); wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
@@ -64,7 +64,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file ) bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
{ {
wxString filename( file ); wxString filename( file );
if (filename.IsEmpty()) filename = wxT(".wxWidgets"); if (filename.IsEmpty()) filename = wxT(".wxWindows");
wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename ); wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );

4
src/gtk1/utilsres.cpp
View File

@@ -28,7 +28,7 @@
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file ) bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
{ {
wxString filename( file ); wxString filename( file );
if (filename.IsEmpty()) filename = wxT(".wxWidgets"); if (filename.IsEmpty()) filename = wxT(".wxWindows");
wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename ); wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
@@ -64,7 +64,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file ) bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
{ {
wxString filename( file ); wxString filename( file );
if (filename.IsEmpty()) filename = wxT(".wxWidgets"); if (filename.IsEmpty()) filename = wxT(".wxWindows");
wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename ); wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );

2
src/html/helpctrl.cpp
View File

@@ -137,7 +137,7 @@ void wxHtmlHelpController::CreateHelpWindow()
{ {
m_Config = wxConfigBase::Get(FALSE); m_Config = wxConfigBase::Get(FALSE);
if (m_Config != NULL) if (m_Config != NULL)
m_ConfigRoot = _T("wxWidgets/wxHtmlHelpController"); m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");
} }
m_helpFrame = CreateHelpFrame(&m_helpData); m_helpFrame = CreateHelpFrame(&m_helpData);

2
src/msw/utils.cpp
View File

@@ -104,7 +104,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// In the WIN.INI file // In the WIN.INI file
static const wxChar WX_SECTION[] = wxT("wxWidgets"); static const wxChar WX_SECTION[] = wxT("wxWindows");
static const wxChar eUSERNAME[] = wxT("UserName"); static const wxChar eUSERNAME[] = wxT("UserName");
// ============================================================================ // ============================================================================