Reverted config/resource name change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
fc57ba5476
commit
e7d9c39867
@ -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")
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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 );
|
||||
|
||||
|
@ -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 );
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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");
|
||||
|
||||
// ============================================================================
|
||||
|
Loading…
Reference in New Issue
Block a user