using subclass as impl ptr, common code in macro because mix-in are not possible...

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

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 7ebc7870694ac22014884cba559ab97b498b04f0..8aa0ea295c24e8570b800400fd8334d32aecf1e8 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -9,31 +9,37 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_VALTEXTH__
-#define _WX_VALTEXTH__
+#ifndef _WX_VALTEXT_H_
+#define _WX_VALTEXT_H_

 
 #include "wx/defs.h"
 
 #if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
 
 
 #include "wx/defs.h"
 
 #if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
 

+class WXDLLIMPEXP_FWD_CORE wxTextEntry;
+

 #include "wx/validate.h"
 
 #include "wx/validate.h"
 

-#define wxFILTER_NONE           0x0000
-#define wxFILTER_ASCII          0x0001
-#define wxFILTER_ALPHA          0x0002
-#define wxFILTER_ALPHANUMERIC   0x0004
-#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
+enum wxTextValidatorStyle

 {
 {

-DECLARE_DYNAMIC_CLASS(wxTextValidator)
-public:
+    wxFILTER_NONE,
+    wxFILTER_ASCII,
+    wxFILTER_ALPHA,
+    wxFILTER_ALPHANUMERIC,
+    wxFILTER_NUMERIC,
+    wxFILTER_INCLUDE_LIST,
+    wxFILTER_EXCLUDE_LIST,
+    wxFILTER_INCLUDE_CHAR_LIST,
+    wxFILTER_EXCLUDE_CHAR_LIST
+};

 
 

-    wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0);
+class WXDLLIMPEXP_CORE wxTextValidator: public wxValidator
+{
+public:
+    wxTextValidator(wxTextValidatorStyle style = wxFILTER_NONE, wxString *val = NULL);
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED_CONSTRUCTOR( wxTextValidator(long style, wxString *val) );
+#endif

     wxTextValidator(const wxTextValidator& val);
 
     virtual ~wxTextValidator(){}
     wxTextValidator(const wxTextValidator& val);
 
     virtual ~wxTextValidator(){}


@@ -56,8 +62,11 @@ public:
     virtual bool TransferFromWindow();
 
     // ACCESSORS
     virtual bool TransferFromWindow();
 
     // ACCESSORS

-    inline long GetStyle() const { return m_validatorStyle; }
-    inline void SetStyle(long style) { m_validatorStyle = style; }
+    inline wxTextValidatorStyle GetStyle() const { return m_validatorStyle; }
+    inline void SetStyle(wxTextValidatorStyle style) { m_validatorStyle = style; }
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( void SetStyle(long style) );
+#endif

 
     wxTextEntry *GetTextEntry();
 
 
     wxTextEntry *GetTextEntry();
 


@@ -73,25 +82,19 @@ public:
     // Filter keystrokes
     void OnChar(wxKeyEvent& event);
 
     // Filter keystrokes
     void OnChar(wxKeyEvent& event);
 

-DECLARE_EVENT_TABLE()
-

 protected:
 protected:

-    long            m_validatorStyle;
-    wxString *      m_stringValue;
-    wxArrayString   m_includes;
-    wxArrayString   m_excludes;
+    wxTextValidatorStyle m_validatorStyle;
+    wxString *           m_stringValue;
+    wxArrayString        m_includes;
+    wxArrayString        m_excludes;

 
 private:
 
 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&);
+    DECLARE_NO_ASSIGN_CLASS(wxTextValidator)
+    DECLARE_DYNAMIC_CLASS(wxTextValidator)
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
   // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
 
 };
 
 #endif
   // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
 

-#endif
-  // _WX_VALTEXTH__
+#endif // _WX_VALTEXT_H_