X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce4169a4d129fc6cd165b2e9ccc5cf5d48356020..aec263582559aff24d79b79b9c93ee7113fca879:/include/wx/valgen.h diff --git a/include/wx/valgen.h b/include/wx/valgen.h index 1dbcdb62ec..44596d0486 100644 --- a/include/wx/valgen.h +++ b/include/wx/valgen.h @@ -5,14 +5,14 @@ // 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__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "valgen.h" #endif @@ -22,6 +22,7 @@ class WXDLLEXPORT wxGenericValidator: public wxValidator { +DECLARE_CLASS(wxGenericValidator) public: wxGenericValidator(bool* val); wxGenericValidator(int* val); @@ -29,7 +30,7 @@ public: 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. @@ -40,7 +41,7 @@ public: // 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(); @@ -55,10 +56,18 @@ protected: 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 +#endif // _WX_VALGENH__