Patch #826420, and also adapted to new SWIG

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

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 42b08aa0bfd05a18c745461db2ff85031649970f..47ed43d83da0bf9eeefb7b04ad865f57b39a285b 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -12,13 +12,13 @@
 #ifndef _WX_VALTEXTH__
 #define _WX_VALTEXTH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #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"
@@ -106,7 +106,7 @@ private:
 };
 
 #endif
-  // wxUSE_VALIDATORS
+  // wxUSE_VALIDATORS && wxUSE_TEXTCTRL
 
 #endif
   // _WX_VALTEXTH__