applied patch 410892 (wxCopyFile uses ::CopyFile under Win32, has overwrite parameter)

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

diff --git a/include/wx/prop.h b/include/wx/prop.h
index bb9ebc64bb470938764ff08630135418cfc31588..109b51a4ad83b0c8a698666cc02dc87dfb18dc22 100644 (file)
--- a/include/wx/prop.h
+++ b/include/wx/prop.h
@@ -26,6 +26,7 @@
 #include "wx/textctrl.h"
 #include "wx/gdicmn.h"
 #include "wx/layout.h"
 #include "wx/textctrl.h"
 #include "wx/gdicmn.h"
 #include "wx/layout.h"

+#include "wx/sizer.h"

 
 class wxWindow;
 class wxProperty;
 
 class wxWindow;
 class wxProperty;


@@ -42,21 +43,31 @@ class WXDLLEXPORT wxPropertySheet: public wxObject
 {
  DECLARE_DYNAMIC_CLASS(wxPropertySheet)
  public:
 {
  DECLARE_DYNAMIC_CLASS(wxPropertySheet)
  public:

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

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

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

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

-  virtual wxProperty *GetProperty(wxString name);
+  virtual wxProperty *GetProperty(const wxString& name) const;

 
   // Clear all properties
   virtual void Clear(void);
 
 
   // Clear all properties
   virtual void Clear(void);
 

-  virtual bool Save(ostream& str);
-  virtual bool Load(ostream& str);
-

   virtual void UpdateAllViews(wxPropertyView *thisView = NULL);
   inline virtual wxList& GetProperties(void) const { return (wxList&) m_properties; }
   
   virtual void UpdateAllViews(wxPropertyView *thisView = NULL);
   inline virtual wxList& GetProperties(void) const { return (wxList&) m_properties; }
   


@@ -67,7 +78,7 @@ class WXDLLEXPORT wxPropertySheet: public wxObject
   wxObject*         m_viewedObject;
   wxList            m_properties;
   wxPropertyView*   m_propertyView;
   wxObject*         m_viewedObject;
   wxList            m_properties;
   wxPropertyView*   m_propertyView;

-
+  wxString                     m_name;

 };
 
 
 };
 
 


@@ -99,9 +110,11 @@ class WXDLLEXPORT wxPropertyView: public wxEvtHandler
   inline virtual void SetPropertySheet(wxPropertySheet *sheet) { m_propertySheet = sheet; }
   inline virtual wxPropertySheet *GetPropertySheet(void) const { return m_propertySheet; }
 
   inline virtual void SetPropertySheet(wxPropertySheet *sheet) { m_propertySheet = sheet; }
   inline virtual wxPropertySheet *GetPropertySheet(void) const { return m_propertySheet; }
 

+/*

   virtual void OnOk(void) {};
   virtual void OnCancel(void) {};
   virtual void OnHelp(void) {};
   virtual void OnOk(void) {};
   virtual void OnCancel(void) {};
   virtual void OnHelp(void) {};

+*/

 
   inline virtual bool OnClose(void) { return FALSE; }
   inline long GetFlags(void) { return m_buttonFlags; }
 
   inline virtual bool OnClose(void) { return FALSE; }
   inline long GetFlags(void) { return m_buttonFlags; }


@@ -126,14 +139,14 @@ class WXDLLEXPORT wxPropertyValidator: public wxEvtHandler
   inline void SetValidatorProperty(wxProperty *prop) { m_validatorProperty = prop; }
   inline wxProperty *GetValidatorProperty(void) const { return m_validatorProperty; }
 
   inline void SetValidatorProperty(wxProperty *prop) { m_validatorProperty = prop; }
   inline wxProperty *GetValidatorProperty(void) const { return m_validatorProperty; }
 

-  virtual bool StringToFloat (char *s, float *number);
-  virtual bool StringToDouble (char *s, double *number);
-  virtual bool StringToInt (char *s, int *number);
-  virtual bool StringToLong (char *s, long *number);
-  virtual char *FloatToString (float number);
-  virtual char *DoubleToString (double number);
-  virtual char *IntToString (int number);
-  virtual char *LongToString (long number);
+  virtual bool StringToFloat (wxChar *s, float *number);
+  virtual bool StringToDouble (wxChar *s, double *number);
+  virtual bool StringToInt (wxChar *s, int *number);
+  virtual bool StringToLong (wxChar *s, long *number);
+  virtual wxChar *FloatToString (float number);
+  virtual wxChar *DoubleToString (double number);
+  virtual wxChar *IntToString (int number);
+  virtual wxChar *LongToString (long number);

 
  protected:
   long          m_validatorFlags;
 
  protected:
   long          m_validatorFlags;


@@ -178,7 +191,7 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
 
   wxPropertyValue(void);                       // Unknown type
   wxPropertyValue(const wxPropertyValue& copyFrom);  // Copy constructor
 
   wxPropertyValue(void);                       // Unknown type
   wxPropertyValue(const wxPropertyValue& copyFrom);  // Copy constructor

-  wxPropertyValue(const char *val);
+  wxPropertyValue(const wxChar *val);

   wxPropertyValue(const wxString& val);
   wxPropertyValue(long val);
   wxPropertyValue(bool val);
   wxPropertyValue(const wxString& val);
   wxPropertyValue(long val);
   wxPropertyValue(bool val);


@@ -187,7 +200,7 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
   wxPropertyValue(wxList *val);
   wxPropertyValue(wxStringList *val);
   // Pointer versions
   wxPropertyValue(wxList *val);
   wxPropertyValue(wxStringList *val);
   // Pointer versions

-  wxPropertyValue(char **val);
+  wxPropertyValue(wxChar **val);

   wxPropertyValue(long *val);
   wxPropertyValue(bool *val);
   wxPropertyValue(float *val);
   wxPropertyValue(long *val);
   wxPropertyValue(bool *val);
   wxPropertyValue(float *val);


@@ -199,11 +212,11 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
   virtual long IntegerValue(void) const;
   virtual float RealValue(void) const;
   virtual bool BoolValue(void) const;
   virtual long IntegerValue(void) const;
   virtual float RealValue(void) const;
   virtual bool BoolValue(void) const;

-  virtual char *StringValue(void) const;
+  virtual wxChar *StringValue(void) const;

   virtual long *IntegerValuePtr(void) const;
   virtual float *RealValuePtr(void) const;
   virtual bool *BoolValuePtr(void) const;
   virtual long *IntegerValuePtr(void) const;
   virtual float *RealValuePtr(void) const;
   virtual bool *BoolValuePtr(void) const;

-  virtual char **StringValuePtr(void) const;
+  virtual wxChar **StringValuePtr(void) const;

 
   // Get nth arg of clause (starting from 1)
   virtual wxPropertyValue *Arg(wxPropertyValueType type, int arg) const;
 
   // Get nth arg of clause (starting from 1)
   virtual wxPropertyValue *Arg(wxPropertyValueType type, int arg) const;


@@ -216,8 +229,8 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
   virtual wxPropertyValue *NewCopy(void) const;
   virtual void Copy(wxPropertyValue& copyFrom);
 
   virtual wxPropertyValue *NewCopy(void) const;
   virtual void Copy(wxPropertyValue& copyFrom);
 

-  virtual void WritePropertyClause(ostream& stream);  // Write this expression as a top-level clause
-  virtual void WritePropertyType(ostream& stream);    // Write as any other subexpression
+  virtual void WritePropertyClause(wxString &stream);  // Write this expression as a top-level clause
+  virtual void WritePropertyType(wxString &stream);    // Write as any other subexpression

 
   // Append an expression to a list
   virtual void Append(wxPropertyValue *expr);
 
   // Append an expression to a list
   virtual void Append(wxPropertyValue *expr);


@@ -257,7 +270,7 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
   void operator=(const long val);
   void operator=(const bool val);
   void operator=(const float val);
   void operator=(const long val);
   void operator=(const bool val);
   void operator=(const float val);

-  void operator=(const char **val);
+  void operator=(const wxChar **val);

   void operator=(const long *val);
   void operator=(const bool *val);
   void operator=(const float *val);
   void operator=(const long *val);
   void operator=(const bool *val);
   void operator=(const float *val);


@@ -269,11 +282,11 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
 
   union {
     long integer; // Also doubles as bool
 
   union {
     long integer; // Also doubles as bool

-    char *string;
+    wxChar *string;

     float real;
     long *integerPtr;
     bool *boolPtr;
     float real;
     long *integerPtr;
     bool *boolPtr;

-    char **stringPtr;
+    wxChar **stringPtr;

     float *realPtr;
     wxPropertyValue *first;  // If is a list expr, points to the first node
     } m_value;
     float *realPtr;
     wxPropertyValue *first;  // If is a list expr, points to the first node
     } m_value;