added support for colour cursors in wxGTK (patch 1655576)

[wxWidgets.git] / contrib / include / wx / deprecated / propform.h

diff --git a/contrib/include/wx/deprecated/propform.h b/contrib/include/wx/deprecated/propform.h
index 705ad97dec3bc7384886b756943a34e825a2e159..21a06030d76fc22e1638446def2fbd36c063130f 100644 (file)
--- 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
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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
 #include "wx/deprecated/setup.h"
 
 #if wxUSE_PROPSHEET


@@ -129,7 +125,7 @@ class WXDLLIMPEXP_DEPRECATED wxPropertyFormValidator: public wxPropertyValidator
   ~wxPropertyFormValidator(void) {}
 
    // Called to check value is OK (e.g. when OK is pressed)
   ~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; }
 
    virtual bool OnCheckValue( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
      wxWindow *WXUNUSED(parentWindow) ) { return true; }
 


@@ -149,12 +145,6 @@ class WXDLLIMPEXP_DEPRECATED wxPropertyFormValidator: public wxPropertyValidator
   virtual void OnCommand( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
      wxWindow *WXUNUSED(parentWindow), wxCommandEvent& WXUNUSED(event) ) {}
 private:
   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

 };
 
 /*
 };
 
 /*