corrected/removed forward declarations

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

diff --git a/include/wx/valgen.h b/include/wx/valgen.h
index 1dbcdb62ecb527db508df3795955f2c879226874..35dd44ff5faaaacb3ede183eec4c431ce7f21070 100644 (file)
--- a/include/wx/valgen.h
+++ b/include/wx/valgen.h
@@ -5,23 +5,20 @@
 // Modified by:
 // Created:     Jan 22 1999
 // RCS-ID:
 // Modified by:
 // Created:     Jan 22 1999
 // RCS-ID:

-// Copyright:   (c) 1999 Kevin Smith
+// Copyright:   (c) 1999 Julian Smart (assigned from Kevin)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VALGENH__
 #define _WX_VALGENH__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VALGENH__
 #define _WX_VALGENH__
 

-#ifdef __GNUG__
-#pragma interface "valgen.h"
-#endif
-

 #include "wx/validate.h"
 
 #if wxUSE_VALIDATORS
 
 class WXDLLEXPORT wxGenericValidator: public wxValidator
 {
 #include "wx/validate.h"
 
 #if wxUSE_VALIDATORS
 
 class WXDLLEXPORT wxGenericValidator: public wxValidator
 {

+DECLARE_CLASS(wxGenericValidator)

 public:
   wxGenericValidator(bool* val);
   wxGenericValidator(int* val);
 public:
   wxGenericValidator(bool* val);
   wxGenericValidator(int* val);


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

-  ~wxGenericValidator();
+  virtual ~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.


@@ -40,7 +37,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();


@@ -55,10 +52,18 @@ protected:
   int*        m_pInt;
   wxString*   m_pString;
   wxArrayInt* m_pArrayInt;
   int*        m_pInt;
   wxString*   m_pString;
   wxArrayInt* m_pArrayInt;

+
+private:
+// Cannot use
+//  DECLARE_NO_COPY_CLASS(wxGenericValidator)
+// because copy constructor is explicitly declared above;
+// but no copy assignment operator is defined, so declare
+// it private to prevent the compiler from defining it:
+    wxGenericValidator& operator=(const wxGenericValidator&);

 };
 
 #endif
   // wxUSE_VALIDATORS
 
 };
 
 #endif
   // wxUSE_VALIDATORS
 

-#endif    
+#endif

   // _WX_VALGENH__
   // _WX_VALGENH__