X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7463f75f9c170c29b4965d27dccf535ac32cfde..3a39df31ff47004a46cfb06f3fb2d3e317f96d2b:/utils/configtool/src/property.h?ds=sidebyside diff --git a/utils/configtool/src/property.h b/utils/configtool/src/property.h index 119bc80ced..e36eeea21b 100644 --- a/utils/configtool/src/property.h +++ b/utils/configtool/src/property.h @@ -7,13 +7,13 @@ // Created: 2003-06-03 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: +// Licence: ///////////////////////////////////////////////////////////////////////////// #ifndef _CT_PROPERTY_H_ #define _CT_PROPERTY_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "property.cpp" #endif @@ -30,30 +30,30 @@ class ctProperty: public wxObject public: ctProperty() { - m_readOnly = FALSE; - m_custom = FALSE; - m_show = TRUE; + m_readOnly = false; + m_custom = false; + m_show = true; } - ctProperty(const ctProperty& property) { Copy(property); } + ctProperty(const ctProperty& property) : wxObject() { Copy(property); } ctProperty(const wxString& descr, const wxVariant& variant, const wxString& editorType = wxEmptyString, - bool readOnly = FALSE) + bool readOnly = false) { m_description = descr; m_variant = variant; m_editorType = editorType; - m_show = TRUE; + m_show = true; m_readOnly = readOnly; - m_custom = FALSE; + m_custom = false; } ctProperty(const wxString& name, const wxString& value = wxEmptyString) { m_variant.SetName(name); m_variant = value; - m_readOnly = FALSE; - m_custom = FALSE; - m_show = TRUE; + m_readOnly = false; + m_custom = false; + m_show = true; } void operator= (const ctProperty& property) { Copy(property); } @@ -91,7 +91,7 @@ public: inline const wxArrayString& GetChoices() const { return m_choices; } inline const wxString& GetDescription() const { return m_description; } inline bool IsCustom() const { return m_custom; } - + inline void SetName(const wxString& name) { m_variant.SetName(name); } inline void SetValue(const wxString& value) { m_variant = value; } inline void SetValue(const wxVariant& value) { m_variant = value; } @@ -134,7 +134,7 @@ class ctProperties: public wxObject DECLARE_CLASS(ctProperties) public: ctProperties() {} - ctProperties(const ctProperties& properties) { Copy(properties); } + ctProperties(const ctProperties& properties) : wxObject() { Copy(properties); } ~ctProperties() { Clear(); } void operator = (const ctProperties& properties) { Clear(); Copy(properties); }