Reset previous sort column in generic wxDataViewColumn::SetSortOrder().

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

diff --git a/include/wx/valgen.h b/include/wx/valgen.h
index 51de5129ac4fad36c77fdbc379ff72afeebe5a59..592afe498119b9d1c9753833c05c33b20eb7d86e 100644 (file)
--- a/include/wx/valgen.h
+++ b/include/wx/valgen.h
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        valgen.h
+// Name:        wx/valgen.h

 // Purpose:     wxGenericValidator class
 // Author:      Kevin Smith
 // Created:     Jan 22 1999
 // Purpose:     wxGenericValidator class
 // Author:      Kevin Smith
 // Created:     Jan 22 1999

-// RCS-ID:      $Id:$
+// RCS-ID:      $Id$

 // Copyright:   (c) 1999 Julian Smart (assigned from Kevin)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1999 Julian Smart (assigned from Kevin)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -16,6 +16,7 @@
 #if wxUSE_VALIDATORS
 
 class WXDLLIMPEXP_FWD_BASE wxDateTime;
 #if wxUSE_VALIDATORS
 
 class WXDLLIMPEXP_FWD_BASE wxDateTime;

+class WXDLLIMPEXP_FWD_BASE wxFileName;

 
 // ----------------------------------------------------------------------------
 // wxGenericValidator performs data transfer between many standard controls and
 
 // ----------------------------------------------------------------------------
 // wxGenericValidator performs data transfer between many standard controls and


@@ -24,7 +25,7 @@ class WXDLLIMPEXP_FWD_BASE wxDateTime;
 // It doesn't do any validation so its name is a slight misnomer.
 // ----------------------------------------------------------------------------
 
 // It doesn't do any validation so its name is a slight misnomer.
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     // Different constructors: each of them creates a validator which can only
 {
 public:
     // Different constructors: each of them creates a validator which can only


@@ -42,6 +43,13 @@ public:
         // wxDatePickerCtrl
     wxGenericValidator(wxDateTime* val);
 #endif // wxUSE_DATETIME
         // wxDatePickerCtrl
     wxGenericValidator(wxDateTime* val);
 #endif // wxUSE_DATETIME

+        // wxTextCtrl
+    wxGenericValidator(wxFileName* val);
+        // wxTextCtrl
+    wxGenericValidator(float* val);
+        // wxTextCtrl
+    wxGenericValidator(double* val);
+

     wxGenericValidator(const wxGenericValidator& copyFrom);
 
     virtual ~wxGenericValidator(){}
     wxGenericValidator(const wxGenericValidator& copyFrom);
 
     virtual ~wxGenericValidator(){}


@@ -73,10 +81,13 @@ protected:
 #if wxUSE_DATETIME
     wxDateTime* m_pDateTime;
 #endif // wxUSE_DATETIME
 #if wxUSE_DATETIME
     wxDateTime* m_pDateTime;
 #endif // wxUSE_DATETIME

+    wxFileName* m_pFileName;
+    float*      m_pFloat;
+    double*     m_pDouble;

 
 private:
     DECLARE_CLASS(wxGenericValidator)
 
 private:
     DECLARE_CLASS(wxGenericValidator)

-    DECLARE_NO_ASSIGN_CLASS(wxGenericValidator)
+    wxDECLARE_NO_ASSIGN_CLASS(wxGenericValidator);

 };
 
 #endif // wxUSE_VALIDATORS
 };
 
 #endif // wxUSE_VALIDATORS