bug fixes for using wxTransientPopupWindow and wxDP_ALLOWNONE support from Andreas...

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

diff --git a/include/wx/valgen.h b/include/wx/valgen.h
index 8a43952b6079956d02b7f838bc12d4dabdf4ac87..395f06a7c012aa224d57e2dc23c923250831c853 100644 (file)
--- a/include/wx/valgen.h
+++ b/include/wx/valgen.h
@@ -4,22 +4,25 @@
 // Author:      Kevin Smith
 // Modified by:
 // Created:     Jan 22 1999
 // Author:      Kevin Smith
 // Modified by:
 // Created:     Jan 22 1999

-// RCS-ID:      
+// RCS-ID:

 // Copyright:   (c) 1999 Kevin Smith
 // Copyright:   (c) 1999 Kevin Smith

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

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "valgen.h"
 #endif
 
 #include "wx/validate.h"
 
 #pragma interface "valgen.h"
 #endif
 
 #include "wx/validate.h"
 

+#if wxUSE_VALIDATORS
+

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

+DECLARE_CLASS(wxGenericValidator)

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


@@ -27,24 +30,24 @@ 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.
   // 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).
 
   // Make a clone of this validator (or return NULL) - currently necessary
   // 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 wxValidator *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();


@@ -53,6 +56,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 // _WX_VALGENH__
+#endif
+  // wxUSE_VALIDATORS
+
+#endif
+  // _WX_VALGENH__