applied heavily modified patch 1116702: support for specifying disabled toolbar image...

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

diff --git a/include/wx/valgen.h b/include/wx/valgen.h
index 2e8da8ca37cb8a3d7360568748754578a24d234c..395f06a7c012aa224d57e2dc23c923250831c853 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:     wxWidgets licence
+// Licence:     wxWindows licence

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


@@ -30,7 +30,7 @@ public:
   wxGenericValidator(wxArrayInt* val);
   wxGenericValidator(const wxGenericValidator& copyFrom);
 
   wxGenericValidator(wxArrayInt* val);
   wxGenericValidator(const wxGenericValidator& copyFrom);
 

-  ~wxGenericValidator();
+  ~wxGenericValidator(){}

 
   // Make a clone of this validator (or return NULL) - currently necessary
   // if you're passing a reference to a validator.
 
   // Make a clone of this validator (or return NULL) - currently necessary
   // if you're passing a reference to a validator.


@@ -41,7 +41,7 @@ public:
 
   // Called when the value in the window must be validated.
   // This function can pop up an error message.
 
   // Called when the value in the window must be validated.
   // This function can pop up an error message.

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

 
   // Called to transfer data to the window
   virtual bool TransferToWindow();
 
   // Called to transfer data to the window
   virtual bool TransferToWindow();


@@ -69,5 +69,5 @@ private:
 #endif
   // wxUSE_VALIDATORS
 
 #endif
   // wxUSE_VALIDATORS
 

-#endif    
+#endif

   // _WX_VALGENH__
   // _WX_VALGENH__