wxCursor(wxImage) added (Chris Elliott, patch 517439)

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

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index bd2bb8d93b35c186c85e05a06981efc3a37fa844..01e0e6d9111d1c4acd7ec98fc4f59bafdbf14d65 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -16,6 +16,10 @@
 #pragma interface "valtext.h"
 #endif
 
 #pragma interface "valtext.h"
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_VALIDATORS
+

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


@@ -30,40 +34,41 @@ class WXDLLEXPORT wxTextValidator: public wxValidator
 {
 DECLARE_DYNAMIC_CLASS(wxTextValidator)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxTextValidator)
 public:

-  wxTextValidator(long style = wxFILTER_NONE, wxString *val = (wxString *) NULL);
-  wxTextValidator(const wxTextValidator& val);

 
 

-  ~wxTextValidator();
+    wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0);
+    wxTextValidator(const wxTextValidator& val);
+
+    ~wxTextValidator();

 
 

-  // Make a clone of this validator (or return NULL) - currently necessary
-  // if you're passing a reference to a validator.
-  // Another possibility is to always pass a pointer to a new validator
-  // (so the calling code can use a copy constructor of the relevant class).
-  virtual wxValidator *Clone(void) const { return new wxTextValidator(*this); }
-  bool Copy(const wxTextValidator& val);
+    // Make a clone of this validator (or return NULL) - currently necessary
+    // if you're passing a reference to a validator.
+    // Another possibility is to always pass a pointer to a new validator
+    // (so the calling code can use a copy constructor of the relevant class).
+    virtual wxObject *Clone() const { return new wxTextValidator(*this); }
+    bool Copy(const wxTextValidator& val);

 
 

-  // Called when the value in the window must be validated.
-  // This function can pop up an error message.
-  virtual bool Validate(wxWindow *parent);
+    // Called when the value in the window must be validated.
+    // This function can pop up an error message.
+    virtual bool Validate(wxWindow *parent);

 
 

-  // Called to transfer data to the window
-  virtual bool TransferToWindow(void);
+    // Called to transfer data to the window
+    virtual bool TransferToWindow();

 
 

-  // Called to transfer data to the window
-  virtual bool TransferFromWindow(void);
+    // Called to transfer data to the window
+    virtual bool TransferFromWindow();

 
 

-  // ACCESSORS
-  inline long GetStyle(void) const { return m_validatorStyle; }
-  inline void SetStyle(long style) { m_validatorStyle = style; }
+    // ACCESSORS
+    inline long GetStyle() const { return m_validatorStyle; }
+    inline void SetStyle(long style) { m_validatorStyle = style; }

 
 

-  void SetIncludeList(const wxStringList& list);
-  inline wxStringList& GetIncludeList(void) { return m_includeList; }
+    void SetIncludeList(const wxStringList& list);
+    inline wxStringList& GetIncludeList() { return m_includeList; }

 
 

-  void SetExcludeList(const wxStringList& list);
-  inline wxStringList& GetExcludeList(void) { return m_excludeList; }
+    void SetExcludeList(const wxStringList& list);
+    inline wxStringList& GetExcludeList() { return m_excludeList; }

 
 

-  // Filter keystrokes
-  void OnChar(wxKeyEvent& event);
+    // Filter keystrokes
+    void OnChar(wxKeyEvent& event);

 
 DECLARE_EVENT_TABLE()
 
 
 DECLARE_EVENT_TABLE()
 


@@ -72,6 +77,22 @@ protected:
     wxString *      m_stringValue;
     wxStringList    m_includeList;
     wxStringList    m_excludeList;
     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;
+    }

 };
 
 #endif
 };
 
 #endif

+  // wxUSE_VALIDATORS
+
+#endif
+  // _WX_VALTEXTH__