avoid a bug in Carbon headers

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

diff --git a/include/wx/valgen.h b/include/wx/valgen.h
index 8fa29d664204fbf8261c12bbbad22275b0a186d8..9da6b104c2f2ee7d1b20de3af6efb847e09ac047 100644 (file)
--- a/include/wx/valgen.h
+++ b/include/wx/valgen.h
@@ -12,14 +12,17 @@
 #ifndef _WX_VALGENH__
 #define _WX_VALGENH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "valgen.h"
 #endif
 
 #include "wx/validate.h"
 
+#if wxUSE_VALIDATORS
+
 class WXDLLEXPORT wxGenericValidator: public wxValidator
 {
+DECLARE_CLASS(wxGenericValidator)
 public:
   wxGenericValidator(bool* val);
   wxGenericValidator(int* val);
@@ -53,6 +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    // _WX_VALGENH__
+#endif
+  // wxUSE_VALIDATORS
+
+#endif    
+  // _WX_VALGENH__