Further performance optimizations

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

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 06a235ae54c3e2da79674bafdfe6e4445182931e..c2a45e8040b5103153df7f7e9a9635e49061bba9 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -6,21 +6,18 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_VALTEXTH__
-#define _WX_VALTEXTH__
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "valtext.h"
-#endif
+#ifndef _WX_VALTEXT_H_
+#define _WX_VALTEXT_H_

 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
+#if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
+
+class WXDLLIMPEXP_FWD_CORE wxTextEntry;

 
 

-#include "wx/textctrl.h"

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


@@ -33,7 +30,7 @@
 #define wxFILTER_INCLUDE_CHAR_LIST 0x0040
 #define wxFILTER_EXCLUDE_CHAR_LIST 0x0080
 
 #define wxFILTER_INCLUDE_CHAR_LIST 0x0040
 #define wxFILTER_EXCLUDE_CHAR_LIST 0x0080
 

-class WXDLLEXPORT wxTextValidator: public wxValidator
+class WXDLLIMPEXP_CORE wxTextValidator: public wxValidator

 {
 DECLARE_DYNAMIC_CLASS(wxTextValidator)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxTextValidator)
 public:


@@ -41,7 +38,7 @@ public:
     wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0);
     wxTextValidator(const wxTextValidator& val);
 
     wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0);
     wxTextValidator(const wxTextValidator& val);
 

-    ~wxTextValidator();
+    virtual ~wxTextValidator(){}

 
     // Make a clone of this validator (or return NULL) - currently necessary
     // if you're passing a reference to a validator.
 
     // Make a clone of this validator (or return NULL) - currently necessary
     // if you're passing a reference to a validator.


@@ -57,44 +54,34 @@ public:
     // Called to transfer data to the window
     virtual bool TransferToWindow();
 
     // Called to transfer data to the window
     virtual bool TransferToWindow();
 

-    // Called to transfer data to the window
+    // Called to transfer data from the window

     virtual bool TransferFromWindow();
 
     // ACCESSORS
     inline long GetStyle() const { return m_validatorStyle; }
     inline void SetStyle(long style) { m_validatorStyle = style; }
 
     virtual bool TransferFromWindow();
 
     // ACCESSORS
     inline long GetStyle() const { return m_validatorStyle; }
     inline void SetStyle(long style) { m_validatorStyle = style; }
 

-    void SetIncludeList(const wxStringList& list);
-    inline wxStringList& GetIncludeList() { return m_includeList; }
+    wxTextEntry *GetTextEntry();
+
+    void SetIncludes(const wxArrayString& includes) { m_includes = includes; }
+    inline wxArrayString& GetIncludes() { return m_includes; }

 
 

-    void SetExcludeList(const wxStringList& list);
-    inline wxStringList& GetExcludeList() { return m_excludeList; }
+    void SetExcludes(const wxArrayString& excludes) { m_excludes = excludes; }
+    inline wxArrayString& GetExcludes() { return m_excludes; }
+
+    bool IsInCharIncludes(const wxString& val);
+    bool IsNotInCharExcludes(const wxString& val);

 
     // 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:
     long            m_validatorStyle;
     wxString *      m_stringValue;
 DECLARE_EVENT_TABLE()
 
 protected:
     long            m_validatorStyle;
     wxString *      m_stringValue;

-    wxStringList    m_includeList;
-    wxStringList    m_excludeList;
-
-    bool CheckValidator() const
-    {
-        wxCHECK_MSG( m_validatorWindow, FALSE,
-                     _T("No window associated with validator") );
-        wxCHECK_MSG( m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)), FALSE,
-                     _T("wxTextValidator is only for wxTextCtrl's") );
-        wxCHECK_MSG( m_stringValue, FALSE,
-                     _T("No variable storage for validator") );
-
-        return TRUE;
-    }
+    wxArrayString   m_includes;
+    wxArrayString   m_excludes;

 
 private:
 // Cannot use
 
 private:
 // Cannot use


@@ -106,7 +93,6 @@ private:
 };
 
 #endif
 };
 
 #endif

-  // wxUSE_VALIDATORS && wxUSE_TEXTCTRL
+  // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)

 
 

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