Corrections to Forty Thieves; wxMemoryDC problem temporarily sorted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -963,13 +963,13 @@ void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) )
|
||||
// Add a property
|
||||
void wxPropertySheet::AddProperty(wxProperty *property)
|
||||
{
|
||||
m_properties.Append(property->GetName().GetData(), property);
|
||||
m_properties.Append((const char*) property->GetName(), property);
|
||||
}
|
||||
|
||||
// Get property by name
|
||||
wxProperty *wxPropertySheet::GetProperty(wxString name)
|
||||
{
|
||||
wxNode *node = m_properties.Find(name.GetData());
|
||||
wxNode *node = m_properties.Find((const char*) name);
|
||||
if (!node)
|
||||
return NULL;
|
||||
else
|
||||
@@ -1018,14 +1018,14 @@ wxPropertyValidatorRegistry::~wxPropertyValidatorRegistry(void)
|
||||
ClearRegistry();
|
||||
}
|
||||
|
||||
void wxPropertyValidatorRegistry::RegisterValidator(wxString& typeName, wxPropertyValidator *validator)
|
||||
void wxPropertyValidatorRegistry::RegisterValidator(const wxString& typeName, wxPropertyValidator *validator)
|
||||
{
|
||||
Put(typeName.GetData(), validator);
|
||||
Put((const char*) typeName, validator);
|
||||
}
|
||||
|
||||
wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(wxString& typeName)
|
||||
wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(const wxString& typeName)
|
||||
{
|
||||
return (wxPropertyValidator *)Get(typeName.GetData());
|
||||
return (wxPropertyValidator *)Get((const char*) typeName);
|
||||
}
|
||||
|
||||
void wxPropertyValidatorRegistry::ClearRegistry(void)
|
||||
|
@@ -150,8 +150,8 @@ class wxPropertyValidatorRegistry: public wxHashTable
|
||||
wxPropertyValidatorRegistry(void);
|
||||
~wxPropertyValidatorRegistry(void);
|
||||
|
||||
virtual void RegisterValidator(wxString& roleName, wxPropertyValidator *validator);
|
||||
virtual wxPropertyValidator *GetValidator(wxString& roleName);
|
||||
virtual void RegisterValidator(const wxString& roleName, wxPropertyValidator *validator);
|
||||
virtual wxPropertyValidator *GetValidator(const wxString& roleName);
|
||||
void ClearRegistry(void);
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user