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

removed cleanup module which was only used for working around bugs in memory debugging code which were fixed since

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-11-25 17:56:47 +00:00
parent e9043580b8
commit 410c3efc05
1 changed files with 18 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/common/sysopt.cpp
View File

@@ -28,95 +28,55 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_SYSTEM_OPTIONS
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/list.h" #include "wx/list.h"
#endif #endif
#if wxUSE_SYSTEM_OPTIONS
#include "wx/string.h" #include "wx/string.h"
#include "wx/sysopt.h" #include "wx/sysopt.h"
#include "wx/module.h"
#include "wx/arrstr.h" #include "wx/arrstr.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// private classes // private globals
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the module which is used to clean up wxSystemOptions data (this is a static wxArrayString gs_optionNames,
// singleton class so it can't be done in the dtor) gs_optionValues;
class wxSystemOptionsModule : public wxModule
{
friend class WXDLLIMPEXP_BASE wxSystemOptions;
public:
virtual bool OnInit();
virtual void OnExit();
private: // ============================================================================
DECLARE_DYNAMIC_CLASS(wxSystemOptionsModule) // wxSystemOptions implementation
// ============================================================================
static wxArrayString sm_optionNames;
static wxArrayString sm_optionValues;
};
// ===========================================================================
// implementation
// ===========================================================================
// ----------------------------------------------------------------------------
// wxSystemOptionsModule
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxSystemOptionsModule, wxModule)
wxArrayString wxSystemOptionsModule::sm_optionNames;
wxArrayString wxSystemOptionsModule::sm_optionValues;
bool wxSystemOptionsModule::OnInit()
{
return true;
}
void wxSystemOptionsModule::OnExit()
{
sm_optionNames.Clear();
sm_optionValues.Clear();
}
// ----------------------------------------------------------------------------
// wxSystemOptions
// ----------------------------------------------------------------------------
// Option functions (arbitrary name/value mapping) // Option functions (arbitrary name/value mapping)
void wxSystemOptions::SetOption(const wxString& name, const wxString& value) void wxSystemOptions::SetOption(const wxString& name, const wxString& value)
{ {
int idx = wxSystemOptionsModule::sm_optionNames.Index(name, false); int idx = gs_optionNames.Index(name, false);
if (idx == wxNOT_FOUND) if (idx == wxNOT_FOUND)
{ {
wxSystemOptionsModule::sm_optionNames.Add(name); gs_optionNames.Add(name);
wxSystemOptionsModule::sm_optionValues.Add(value); gs_optionValues.Add(value);
} }
else else
{ {
wxSystemOptionsModule::sm_optionNames[idx] = name; gs_optionNames[idx] = name;
wxSystemOptionsModule::sm_optionValues[idx] = value; gs_optionValues[idx] = value;
} }
} }
void wxSystemOptions::SetOption(const wxString& name, int value) void wxSystemOptions::SetOption(const wxString& name, int value)
{ {
wxString valStr; SetOption(name, wxString::Format(wxT("%d"), value));
valStr.Printf(wxT("%d"), value);
SetOption(name, valStr);
} }
wxString wxSystemOptions::GetOption(const wxString& name) wxString wxSystemOptions::GetOption(const wxString& name)
{ {
int idx = wxSystemOptionsModule::sm_optionNames.Index(name, false); int idx = gs_optionNames.Index(name, false);
if (idx == wxNOT_FOUND) if (idx == wxNOT_FOUND)
return wxEmptyString; return wxEmptyString;
else else
return wxSystemOptionsModule::sm_optionValues[idx]; return gs_optionValues[idx];
} }
int wxSystemOptions::GetOptionInt(const wxString& name) int wxSystemOptions::GetOptionInt(const wxString& name)
@@ -126,9 +86,8 @@ int wxSystemOptions::GetOptionInt(const wxString& name)
bool wxSystemOptions::HasOption(const wxString& name) bool wxSystemOptions::HasOption(const wxString& name)
{ {
return (wxSystemOptionsModule::sm_optionNames.Index(name, false) != wxNOT_FOUND); return gs_optionNames.Index(name, false) != wxNOT_FOUND;
} }
#endif #endif // wxUSE_SYSTEM_OPTIONS
// wxUSE_SYSTEM_OPTIONS