added ctor taking wxFontFlags

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

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 01e0e6d9111d1c4acd7ec98fc4f59bafdbf14d65..cf15da9903600d7fcf9467f9799cd4f3701273d8 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -12,7 +12,7 @@
 #ifndef _WX_VALTEXTH__
 #define _WX_VALTEXTH__
 
 #ifndef _WX_VALTEXTH__
 #define _WX_VALTEXTH__
 

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

 #pragma interface "valtext.h"
 #endif
 
 #pragma interface "valtext.h"
 #endif
 


@@ -20,6 +20,7 @@
 
 #if wxUSE_VALIDATORS
 
 
 #if wxUSE_VALIDATORS
 

+#include "wx/textctrl.h"

 #include "wx/validate.h"
 
 #define wxFILTER_NONE           0x0000
 #include "wx/validate.h"
 
 #define wxFILTER_NONE           0x0000


@@ -29,6 +30,8 @@
 #define wxFILTER_NUMERIC        0x0008
 #define wxFILTER_INCLUDE_LIST   0x0010
 #define wxFILTER_EXCLUDE_LIST   0x0020
 #define wxFILTER_NUMERIC        0x0008
 #define wxFILTER_INCLUDE_LIST   0x0010
 #define wxFILTER_EXCLUDE_LIST   0x0020

+#define wxFILTER_INCLUDE_CHAR_LIST 0x0040
+#define wxFILTER_EXCLUDE_CHAR_LIST 0x0080

 
 class WXDLLEXPORT wxTextValidator: public wxValidator
 {
 
 class WXDLLEXPORT wxTextValidator: public wxValidator
 {


@@ -70,6 +73,9 @@ public:
     // Filter keystrokes
     void OnChar(wxKeyEvent& event);
 
     // Filter keystrokes
     void OnChar(wxKeyEvent& event);
 

+    bool IsInCharIncludeList(const wxString& val);
+    bool IsNotInCharExcludeList(const wxString& val);
+

 DECLARE_EVENT_TABLE()
 
 protected:
 DECLARE_EVENT_TABLE()
 
 protected: