corrected control inheritance

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

diff --git a/include/wx/valgen.h b/include/wx/valgen.h
index 009db0c2dc1d125dd2b1748e13dfe7edd3876a83..1dbcdb62ecb527db508df3795955f2c879226874 100644 (file)
--- a/include/wx/valgen.h
+++ b/include/wx/valgen.h
@@ -6,7 +6,7 @@
 // Created:     Jan 22 1999
 // RCS-ID:
 // Copyright:   (c) 1999 Kevin Smith
 // Created:     Jan 22 1999
 // RCS-ID:
 // Copyright:   (c) 1999 Kevin Smith

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VALGENH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VALGENH__


@@ -18,6 +18,8 @@
 
 #include "wx/validate.h"
 
 
 #include "wx/validate.h"
 

+#if wxUSE_VALIDATORS
+

 class WXDLLEXPORT wxGenericValidator: public wxValidator
 {
 public:
 class WXDLLEXPORT wxGenericValidator: public wxValidator
 {
 public:


@@ -33,18 +35,18 @@ public:
   // if you're passing a reference to a validator.
   // Another possibility is to always pass a pointer to a new validator
   // (so the calling code can use a copy constructor of the relevant class).
   // if you're passing a reference to a validator.
   // Another possibility is to always pass a pointer to a new validator
   // (so the calling code can use a copy constructor of the relevant class).

-  virtual wxObject *Clone(void) const { return new wxGenericValidator(*this); }
+  virtual wxObject *Clone() const { return new wxGenericValidator(*this); }

   bool Copy(const wxGenericValidator& val);
 
   // Called when the value in the window must be validated.
   // This function can pop up an error message.
   bool Copy(const wxGenericValidator& val);
 
   // Called when the value in the window must be validated.
   // This function can pop up an error message.

-  virtual bool Validate(wxWindow *parent)      {return TRUE;}
+  virtual bool Validate(wxWindow * WXUNUSED(parent)) { return TRUE; }

 
   // Called to transfer data to the window
 
   // Called to transfer data to the window

-  virtual bool TransferToWindow(void);
+  virtual bool TransferToWindow();

 
   // Called to transfer data to the window
 
   // Called to transfer data to the window

-  virtual bool TransferFromWindow(void);
+  virtual bool TransferFromWindow();

 
 protected:
   void Initialize();
 
 protected:
   void Initialize();


@@ -55,4 +57,8 @@ protected:
   wxArrayInt* m_pArrayInt;
 };
 
   wxArrayInt* m_pArrayInt;
 };
 

-#endif // _WX_VALGENH__
+#endif
+  // wxUSE_VALIDATORS
+
+#endif    
+  // _WX_VALGENH__