1. wxLoad/SaveFileSelector return "wxString" instead of "char *"

[wxWidgets.git] / include / wx / prop.h

diff --git a/include/wx/prop.h b/include/wx/prop.h
index e753c0293e72af642562f810e1341c7f7965e6cb..327bd20379f052a339bdeb85122b9d02f86a48da 100644 (file)
--- a/include/wx/prop.h
+++ b/include/wx/prop.h
@@ -38,13 +38,26 @@ class wxPropertyValidatorRegistry;
 #define wxPROPERTY_VERSION 2.0
 
 // A storable sheet of values
 #define wxPROPERTY_VERSION 2.0
 
 // A storable sheet of values

-class wxPropertySheet: public wxObject
+class WXDLLEXPORT wxPropertySheet: public wxObject

 {
  DECLARE_DYNAMIC_CLASS(wxPropertySheet)
  public:
 {
  DECLARE_DYNAMIC_CLASS(wxPropertySheet)
  public:

-  wxPropertySheet(void);
+  wxPropertySheet(wxString name = "");

   ~wxPropertySheet(void);
 
   ~wxPropertySheet(void);
 

+  // Set the name of the sheet
+  inline virtual void SetName(wxString name) { m_name=name; }
+  inline virtual wxString GetName() { return m_name; }
+  // Does this sheet contain a property with this name
+  virtual bool HasProperty(wxString name);
+
+  // Set property name to value
+  virtual bool SetProperty(const wxString name, wxPropertyValue value);
+
+  // Remove property from sheet by name, deleting it
+  virtual void RemoveProperty(wxString name);
+
+  // Get the name of the sheet

   // Add a property
   virtual void AddProperty(wxProperty *property);
 
   // Add a property
   virtual void AddProperty(wxProperty *property);
 


@@ -67,13 +80,13 @@ class wxPropertySheet: public wxObject
   wxObject*         m_viewedObject;
   wxList            m_properties;
   wxPropertyView*   m_propertyView;
   wxObject*         m_viewedObject;
   wxList            m_properties;
   wxPropertyView*   m_propertyView;

-
+  wxString                     m_name;

 };
 
 
 // Base class for property sheet views. There are currently two directly derived
 // classes: wxPropertyListView, and wxPropertyFormView.
 };
 
 
 // Base class for property sheet views. There are currently two directly derived
 // classes: wxPropertyListView, and wxPropertyFormView.

-class wxPropertyView: public wxEvtHandler
+class WXDLLEXPORT wxPropertyView: public wxEvtHandler

 {
  DECLARE_DYNAMIC_CLASS(wxPropertyView)
  public:
 {
  DECLARE_DYNAMIC_CLASS(wxPropertyView)
  public:


@@ -115,7 +128,7 @@ class wxPropertyView: public wxEvtHandler
 };
 
 
 };
 
 

-class wxPropertyValidator: public wxEvtHandler
+class WXDLLEXPORT wxPropertyValidator: public wxEvtHandler

 {
   DECLARE_DYNAMIC_CLASS(wxPropertyValidator)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxPropertyValidator)
  public:


@@ -143,7 +156,7 @@ class wxPropertyValidator: public wxEvtHandler
 
 // extern wxPropertyValidator *wxDefaultPropertyValidator;
 
 
 // extern wxPropertyValidator *wxDefaultPropertyValidator;
 

-class wxPropertyValidatorRegistry: public wxHashTable
+class WXDLLEXPORT wxPropertyValidatorRegistry: public wxHashTable

 {
   DECLARE_DYNAMIC_CLASS(wxPropertyValidatorRegistry)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxPropertyValidatorRegistry)
  public:


@@ -172,7 +185,7 @@ typedef enum {
     wxPropertyValueStringPtr
 } wxPropertyValueType;
 
     wxPropertyValueStringPtr
 } wxPropertyValueType;
 

-class wxPropertyValue: public wxObject
+class WXDLLEXPORT wxPropertyValue: public wxObject

 {
   DECLARE_DYNAMIC_CLASS(wxPropertyValue)
 
 {
   DECLARE_DYNAMIC_CLASS(wxPropertyValue)
 


@@ -287,7 +300,7 @@ class wxPropertyValue: public wxObject
  * Property class: contains a name and a value.
  */
 
  * Property class: contains a name and a value.
  */
 

-class wxProperty: public wxObject
+class WXDLLEXPORT wxProperty: public wxObject

 {
   DECLARE_DYNAMIC_CLASS(wxProperty)
  protected:
 {
   DECLARE_DYNAMIC_CLASS(wxProperty)
  protected: