From e7d9c398677ad0cc32735132d841de31eaf675ea Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 26 May 2004 10:49:43 +0000
Subject: [PATCH] Reverted config/resource name change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/fmappriv.h | 2 +-
src/generic/filedlgg.cpp | 8 ++++----
src/gtk/utilsres.cpp | 4 ++--
src/gtk1/utilsres.cpp | 4 ++--
src/html/helpctrl.cpp | 2 +-
src/msw/utils.cpp | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/wx/fmappriv.h b/include/wx/fmappriv.h
index 37bd783ced..63924093ce 100644
--- a/include/wx/fmappriv.h
+++ b/include/wx/fmappriv.h
@@ -25,7 +25,7 @@ enum { wxFONTENCODING_UNKNOWN = -2 };
// the config paths we use
#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_ALIAS_PATH wxT("Aliases")
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 0b0d167ebe..903c2423cc 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -873,9 +873,9 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
if (wxConfig::Get(FALSE))
{
- wxConfig::Get()->Read(wxT("/wxWidgets/wxFileDialog/ViewStyle"),
+ wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
&ms_lastViewStyle);
- wxConfig::Get()->Read(wxT("/wxWidgets/wxFileDialog/ShowHidden"),
+ wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
&ms_lastShowHidden);
}
@@ -1037,9 +1037,9 @@ wxGenericFileDialog::~wxGenericFileDialog()
{
if (wxConfig::Get(FALSE))
{
- wxConfig::Get()->Write(wxT("/wxWidgets/wxFileDialog/ViewStyle"),
+ wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
ms_lastViewStyle);
- wxConfig::Get()->Write(wxT("/wxWidgets/wxFileDialog/ShowHidden"),
+ wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
ms_lastShowHidden);
}
diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index e3f817e19f..69c6097176 100644
--- a/src/gtk/utilsres.cpp
+++ b/src/gtk/utilsres.cpp
@@ -28,7 +28,7 @@
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
{
wxString filename( file );
- if (filename.IsEmpty()) filename = wxT(".wxWidgets");
+ if (filename.IsEmpty()) filename = wxT(".wxWindows");
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 )
{
wxString filename( file );
- if (filename.IsEmpty()) filename = wxT(".wxWidgets");
+ if (filename.IsEmpty()) filename = wxT(".wxWindows");
wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index e3f817e19f..69c6097176 100644
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -28,7 +28,7 @@
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
{
wxString filename( file );
- if (filename.IsEmpty()) filename = wxT(".wxWidgets");
+ if (filename.IsEmpty()) filename = wxT(".wxWindows");
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 )
{
wxString filename( file );
- if (filename.IsEmpty()) filename = wxT(".wxWidgets");
+ if (filename.IsEmpty()) filename = wxT(".wxWindows");
wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index ca6194c4cc..5f0bc3fd68 100644
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -137,7 +137,7 @@ void wxHtmlHelpController::CreateHelpWindow()
{
m_Config = wxConfigBase::Get(FALSE);
if (m_Config != NULL)
- m_ConfigRoot = _T("wxWidgets/wxHtmlHelpController");
+ m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");
}
m_helpFrame = CreateHelpFrame(&m_helpData);
diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 51f41d61c7..3f96945518 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -104,7 +104,7 @@
// ----------------------------------------------------------------------------
// 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");
// ============================================================================
--
2.47.2