Support bitmaps and text and header columns using wxImageList, minor sizing corrections

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

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 43b6380ef379ea3b4da126753cb57d91a892ebe6..c2a45e8040b5103153df7f7e9a9635e49061bba9 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -9,14 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_VALTEXTH__
-#define _WX_VALTEXTH__
+#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


@@ -29,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:


@@ -37,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.


@@ -60,16 +61,7 @@ public:
     inline long GetStyle() const { return m_validatorStyle; }
     inline void SetStyle(long style) { m_validatorStyle = style; }
 
     inline long GetStyle() const { return m_validatorStyle; }
     inline void SetStyle(long style) { m_validatorStyle = style; }
 

-#if WXWIN_COMPATIBILITY_2_4
-    wxDEPRECATED( void SetIncludeList(const wxStringList& list) );
-    wxDEPRECATED( wxStringList& GetIncludeList() );
-
-    wxDEPRECATED( void SetExcludeList(const wxStringList& list) );
-    wxDEPRECATED( wxStringList& GetExcludeList() );
-
-    wxDEPRECATED( bool IsInCharIncludeList(const wxString& val) );
-    wxDEPRECATED( bool IsNotInCharExcludeList(const wxString& val) );
-#endif
+    wxTextEntry *GetTextEntry();

 
     void SetIncludes(const wxArrayString& includes) { m_includes = includes; }
     inline wxArrayString& GetIncludes() { return m_includes; }
 
     void SetIncludes(const wxArrayString& includes) { m_includes = includes; }
     inline wxArrayString& GetIncludes() { return m_includes; }


@@ -83,31 +75,14 @@ public:
     // Filter keystrokes
     void OnChar(wxKeyEvent& event);
 
     // Filter keystrokes
     void OnChar(wxKeyEvent& event);
 

-

 DECLARE_EVENT_TABLE()
 
 protected:
     long            m_validatorStyle;
     wxString *      m_stringValue;
 DECLARE_EVENT_TABLE()
 
 protected:
     long            m_validatorStyle;
     wxString *      m_stringValue;

-#if WXWIN_COMPATIBILITY_2_4
-    wxStringList    m_includeList;
-    wxStringList    m_excludeList;
-#endif

     wxArrayString   m_includes;
     wxArrayString   m_excludes;
 
     wxArrayString   m_includes;
     wxArrayString   m_excludes;
 

-    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;
-    }
-

 private:
 // Cannot use
 //  DECLARE_NO_COPY_CLASS(wxTextValidator)
 private:
 // Cannot use
 //  DECLARE_NO_COPY_CLASS(wxTextValidator)


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

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

 
 

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