X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a3bdee6a979146c426cd058e9bfe6b58135b124..e570a44b372cf56526c128eab646615fa59520fc:/contrib/include/wx/deprecated/prop.h

diff --git a/contrib/include/wx/deprecated/prop.h b/contrib/include/wx/deprecated/prop.h
index 8882220e2f..10154f5493 100644
--- a/contrib/include/wx/deprecated/prop.h
+++ b/contrib/include/wx/deprecated/prop.h
@@ -6,16 +6,12 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PROP_H_
 #define _WX_PROP_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "prop.h"
-#endif
-
 #include "wx/deprecated/setup.h"
 
 #if wxUSE_PROPSHEET
@@ -43,7 +39,7 @@ class wxPropertyValidatorRegistry;
 #define wxPROPERTY_VERSION 2.0
 
 // A storable sheet of values
-class WXDLLEXPORT wxPropertySheet: public wxObject
+class WXDLLIMPEXP_DEPRECATED wxPropertySheet: public wxObject
 {
 public:
     wxPropertySheet(const wxString& name = wxT(""));
@@ -52,7 +48,7 @@ public:
     // 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;
 
@@ -74,16 +70,16 @@ public:
 
     virtual void UpdateAllViews(wxPropertyView *thisView = NULL);
     inline virtual wxList& GetProperties() const { return (wxList&) m_properties; }
-  
+
     // Sets/clears the modified flag for each property value
-    virtual void SetAllModified(bool flag = TRUE);
+    virtual void SetAllModified(bool flag = true);
 
 protected:
     wxObject*         m_viewedObject;
     wxList            m_properties;
     wxPropertyView*   m_propertyView;
-    wxString			m_name;
-  
+    wxString          m_name;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxPropertySheet)
 };
@@ -91,7 +87,7 @@ private:
 
 // Base class for property sheet views. There are currently two directly derived
 // classes: wxPropertyListView, and wxPropertyFormView.
-class WXDLLEXPORT wxPropertyView: public wxEvtHandler
+class WXDLLIMPEXP_DEPRECATED wxPropertyView: public wxEvtHandler
 {
 public:
     wxPropertyView(long flags = 0);
@@ -102,7 +98,7 @@ public:
 
     // Update this view of the viewed object, called e.g. by
     // the object itself.
-    virtual bool OnUpdateView() {return FALSE;};
+    virtual bool OnUpdateView() {return false;};
 
     // Override this to do something as soon as the property changed,
     // if the view and validators support it.
@@ -116,7 +112,7 @@ public:
     inline virtual void SetPropertySheet(wxPropertySheet *sheet) { m_propertySheet = sheet; }
     inline virtual wxPropertySheet *GetPropertySheet() const { return m_propertySheet; }
 
-    inline virtual bool OnClose() { return FALSE; }
+    inline virtual bool OnClose() { return false; }
     inline long GetFlags(void) { return m_buttonFlags; }
 
 protected:
@@ -125,13 +121,13 @@ protected:
     wxProperty*           m_currentProperty;
     wxList                m_validatorRegistryList;
     wxPropertyValidator*  m_currentValidator;
-  
+
 private:
     DECLARE_DYNAMIC_CLASS(wxPropertyView)
 };
 
 
-class WXDLLEXPORT wxPropertyValidator: public wxEvtHandler
+class WXDLLIMPEXP_DEPRECATED wxPropertyValidator: public wxEvtHandler
 {
 public:
     wxPropertyValidator(long flags = 0);
@@ -153,7 +149,7 @@ public:
 protected:
     long          m_validatorFlags;
     wxProperty*   m_validatorProperty;
-  
+
 private:
     DECLARE_DYNAMIC_CLASS(wxPropertyValidator)
 };
@@ -161,7 +157,7 @@ private:
 
 // extern wxPropertyValidator *wxDefaultPropertyValidator;
 
-class WXDLLEXPORT wxPropertyValidatorRegistry: public wxHashTable
+class WXDLLIMPEXP_DEPRECATED wxPropertyValidatorRegistry: public wxHashTable
 {
 public:
     wxPropertyValidatorRegistry();
@@ -170,7 +166,7 @@ public:
     virtual void RegisterValidator(const wxString& roleName, wxPropertyValidator *validator);
     virtual wxPropertyValidator *GetValidator(const wxString& roleName);
     void ClearRegistry();
-  
+
 private:
     DECLARE_DYNAMIC_CLASS(wxPropertyValidatorRegistry)
 };
@@ -192,7 +188,7 @@ typedef enum {
     wxPropertyValueStringPtr
 } wxPropertyValueType;
 
-class WXDLLEXPORT wxPropertyValue: public wxObject
+class WXDLLIMPEXP_DEPRECATED wxPropertyValue: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxPropertyValue)
 
@@ -255,7 +251,7 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
   // Get last expr in list
   virtual inline wxPropertyValue *GetLast(void) const
     { return ((m_type == wxPropertyValueList) ? m_last : (wxPropertyValue*)NULL); }
-  
+
   // Delete this node from the list
   virtual void Delete(wxPropertyValue *node);
 
@@ -266,8 +262,8 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
   virtual inline wxObject *GetClientData(void) { return m_clientData; }
 
   virtual wxString GetStringRepresentation(void);
-  
-  inline void SetModified(bool flag = TRUE) { m_modifiedFlag = flag; }
+
+  inline void SetModified(bool flag = true) { m_modifiedFlag = flag; }
   inline bool GetModified(void) { return m_modifiedFlag; }
 
   // Operators
@@ -307,7 +303,7 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
  * Property class: contains a name and a value.
  */
 
-class WXDLLEXPORT wxProperty: public wxObject
+class WXDLLIMPEXP_DEPRECATED wxProperty: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxProperty)
  protected:
@@ -336,7 +332,7 @@ class WXDLLEXPORT wxProperty: public wxObject
   void operator=(const wxPropertyValue& val);
   virtual inline void SetWindow(wxWindow *win) { m_propertyWindow = win; }
   virtual inline wxWindow *GetWindow(void) const { return m_propertyWindow; }
-  
+
   inline void Enable(bool en) { m_enabled = en; }
   inline bool IsEnabled(void) const { return m_enabled; }
 };