Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 0d986f0270de6f712850f03e202638001710811d..06a235ae54c3e2da79674bafdfe6e4445182931e 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -6,20 +6,21 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:    wxWindows license
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VALTEXTH__
 #define _WX_VALTEXTH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "valtext.h"
 #endif
 
 #include "wx/defs.h"
 
-#if wxUSE_VALIDATORS
+#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
 
+#include "wx/textctrl.h"
 #include "wx/validate.h"
 
 #define wxFILTER_NONE           0x0000
@@ -94,10 +95,18 @@ protected:
 
         return TRUE;
     }
+
+private:
+// Cannot use
+//  DECLARE_NO_COPY_CLASS(wxTextValidator)
+// 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:
+    wxTextValidator& operator=(const wxTextValidator&);
 };
 
 #endif
-  // wxUSE_VALIDATORS
+  // wxUSE_VALIDATORS && wxUSE_TEXTCTRL
 
 #endif
   // _WX_VALTEXTH__