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

diff --git a/contrib/include/wx/deprecated/propform.h b/contrib/include/wx/deprecated/propform.h
index dabcc80eb0..21a06030d7 100644
--- a/contrib/include/wx/deprecated/propform.h
+++ b/contrib/include/wx/deprecated/propform.h
@@ -6,16 +6,12 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PROPFORM_H_
 #define _WX_PROPFORM_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "propform.h"
-#endif
-
 #include "wx/deprecated/setup.h"
 
 #if wxUSE_PROPSHEET
@@ -23,7 +19,7 @@
 #include "wx/deprecated/prop.h"
 #include "wx/panel.h"
 
-class WXDLLEXPORT wxPropertyFormView;
+class WXDLLIMPEXP_DEPRECATED wxPropertyFormView;
 
 ////
 //// Property form classes: for using an existing dialog or panel
@@ -33,7 +29,7 @@ class WXDLLEXPORT wxPropertyFormView;
 #define wxID_PROP_UPDATE        3101
 
 // Mediates between a physical panel and the property sheet
-class WXDLLEXPORT wxPropertyFormView: public wxPropertyView
+class WXDLLIMPEXP_DEPRECATED wxPropertyFormView: public wxPropertyView
 {
  DECLARE_DYNAMIC_CLASS(wxPropertyFormView)
  public:
@@ -120,7 +116,7 @@ DECLARE_EVENT_TABLE()
  * assocated with a window. It's that kinda thing.
  */
 
-class WXDLLEXPORT wxPropertyFormValidator: public wxPropertyValidator
+class WXDLLIMPEXP_DEPRECATED wxPropertyFormValidator: public wxPropertyValidator
 {
   DECLARE_DYNAMIC_CLASS(wxPropertyFormValidator)
  protected:
@@ -129,9 +125,9 @@ class WXDLLEXPORT wxPropertyFormValidator: public wxPropertyValidator
   ~wxPropertyFormValidator(void) {}
 
    // Called to check value is OK (e.g. when OK is pressed)
-   // Return FALSE if value didn't check out; signal to restore old value.
+   // Return false if value didn't check out; signal to restore old value.
    virtual bool OnCheckValue( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
-     wxWindow *WXUNUSED(parentWindow) ) { return TRUE; }
+     wxWindow *WXUNUSED(parentWindow) ) { return true; }
 
    // Does the transferance from the property editing area to the property itself.
    // Called by the view, e.g. when closing the window.
@@ -149,19 +145,13 @@ class WXDLLEXPORT wxPropertyFormValidator: public wxPropertyValidator
   virtual void OnCommand( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
      wxWindow *WXUNUSED(parentWindow), wxCommandEvent& WXUNUSED(event) ) {}
 private:
-// Virtual function hiding suppression
-#if WXWIN_COMPATIBILITY_2
-    virtual void OnCommand(wxWindow& win,
-                           wxCommandEvent& event)
-    { wxEvtHandler::OnCommand(win, event); }
-#endif
 };
 
 /*
  * Some default validators
  */
 
-class WXDLLEXPORT wxRealFormValidator: public wxPropertyFormValidator
+class WXDLLIMPEXP_DEPRECATED wxRealFormValidator: public wxPropertyFormValidator
 {
   DECLARE_DYNAMIC_CLASS(wxRealFormValidator)
  public:
@@ -182,7 +172,7 @@ class WXDLLEXPORT wxRealFormValidator: public wxPropertyFormValidator
   float         m_realMax;
 };
 
-class WXDLLEXPORT wxIntegerFormValidator: public wxPropertyFormValidator
+class WXDLLIMPEXP_DEPRECATED wxIntegerFormValidator: public wxPropertyFormValidator
 {
   DECLARE_DYNAMIC_CLASS(wxIntegerFormValidator)
  public:
@@ -202,7 +192,7 @@ class WXDLLEXPORT wxIntegerFormValidator: public wxPropertyFormValidator
   long          m_integerMax;
 };
 
-class WXDLLEXPORT wxBoolFormValidator: public wxPropertyFormValidator
+class WXDLLIMPEXP_DEPRECATED wxBoolFormValidator: public wxPropertyFormValidator
 {
   DECLARE_DYNAMIC_CLASS(wxBoolFormValidator)
  protected:
@@ -217,7 +207,7 @@ class WXDLLEXPORT wxBoolFormValidator: public wxPropertyFormValidator
    bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
 };
 
-class WXDLLEXPORT wxStringFormValidator: public wxPropertyFormValidator
+class WXDLLIMPEXP_DEPRECATED wxStringFormValidator: public wxPropertyFormValidator
 {
   DECLARE_DYNAMIC_CLASS(wxStringFormValidator)
  public:
@@ -241,7 +231,7 @@ class WXDLLEXPORT wxStringFormValidator: public wxPropertyFormValidator
  * A default dialog box class to use.
  */
 
-class WXDLLEXPORT wxPropertyFormDialog: public wxDialog
+class WXDLLIMPEXP_DEPRECATED wxPropertyFormDialog: public wxDialog
 {
 public:
     wxPropertyFormDialog(wxPropertyFormView *v = NULL,
@@ -270,7 +260,7 @@ private:
  * A default panel class to use.
  */
 
-class WXDLLEXPORT wxPropertyFormPanel: public wxPanel
+class WXDLLIMPEXP_DEPRECATED wxPropertyFormPanel: public wxPanel
 {
 public:
     wxPropertyFormPanel(wxPropertyFormView *v = NULL,
@@ -279,7 +269,7 @@ public:
                         const wxSize& size = wxDefaultSize,
                         long style = 0,
                         const wxString& name = _T("panel"))
-        : wxPanel(parent, -1, pos, size, style, name)
+        : wxPanel(parent, wxID_ANY, pos, size, style, name)
         {
             m_view = v;
         }
@@ -301,7 +291,7 @@ private:
  * A default frame class to use.
  */
 
-class WXDLLEXPORT wxPropertyFormFrame: public wxFrame
+class WXDLLIMPEXP_DEPRECATED wxPropertyFormFrame: public wxFrame
 {
 public:
     wxPropertyFormFrame(wxPropertyFormView *v = NULL,
@@ -311,7 +301,7 @@ public:
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
                         const wxString& name = _T("frame"))
-        : wxFrame(parent, -1, title, pos, size, style, name)
+        : wxFrame(parent, wxID_ANY, title, pos, size, style, name)
         {
             m_view = v;
             m_propertyPanel = NULL;