removed cleanup module which was only used for working around bugs in memory debugging code which were fixed since
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -28,95 +28,55 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if wxUSE_SYSTEM_OPTIONS
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/list.h"
|
||||
#endif
|
||||
|
||||
#if wxUSE_SYSTEM_OPTIONS
|
||||
|
||||
#include "wx/string.h"
|
||||
#include "wx/sysopt.h"
|
||||
#include "wx/module.h"
|
||||
#include "wx/arrstr.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// private classes
|
||||
// private globals
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// the module which is used to clean up wxSystemOptions data (this is a
|
||||
// singleton class so it can't be done in the dtor)
|
||||
class wxSystemOptionsModule : public wxModule
|
||||
{
|
||||
friend class WXDLLIMPEXP_BASE wxSystemOptions;
|
||||
public:
|
||||
virtual bool OnInit();
|
||||
virtual void OnExit();
|
||||
static wxArrayString gs_optionNames,
|
||||
gs_optionValues;
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxSystemOptionsModule)
|
||||
|
||||
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
|
||||
// ----------------------------------------------------------------------------
|
||||
// ============================================================================
|
||||
// wxSystemOptions implementation
|
||||
// ============================================================================
|
||||
|
||||
// Option functions (arbitrary name/value mapping)
|
||||
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)
|
||||
{
|
||||
wxSystemOptionsModule::sm_optionNames.Add(name);
|
||||
wxSystemOptionsModule::sm_optionValues.Add(value);
|
||||
gs_optionNames.Add(name);
|
||||
gs_optionValues.Add(value);
|
||||
}
|
||||
else
|
||||
{
|
||||
wxSystemOptionsModule::sm_optionNames[idx] = name;
|
||||
wxSystemOptionsModule::sm_optionValues[idx] = value;
|
||||
gs_optionNames[idx] = name;
|
||||
gs_optionValues[idx] = value;
|
||||
}
|
||||
}
|
||||
|
||||
void wxSystemOptions::SetOption(const wxString& name, int value)
|
||||
{
|
||||
wxString valStr;
|
||||
valStr.Printf(wxT("%d"), value);
|
||||
SetOption(name, valStr);
|
||||
SetOption(name, wxString::Format(wxT("%d"), value));
|
||||
}
|
||||
|
||||
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)
|
||||
return wxEmptyString;
|
||||
else
|
||||
return wxSystemOptionsModule::sm_optionValues[idx];
|
||||
return gs_optionValues[idx];
|
||||
}
|
||||
|
||||
int wxSystemOptions::GetOptionInt(const wxString& name)
|
||||
@@ -126,9 +86,8 @@ int wxSystemOptions::GetOptionInt(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
|
||||
// wxUSE_SYSTEM_OPTIONS
|
||||
#endif // wxUSE_SYSTEM_OPTIONS
|
||||
|
||||
|
Reference in New Issue
Block a user