Add missing wxUSE_OLE checks to safearray.cpp.

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

diff --git a/include/wx/valgen.h b/include/wx/valgen.h
index 8da3bb2efcae8b1dc1699dbcdd48ba0b7791f552..592afe498119b9d1c9753833c05c33b20eb7d86e 100644 (file)
--- a/include/wx/valgen.h
+++ b/include/wx/valgen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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


@@ -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


@@ -34,8 +35,6 @@ public:
     wxGenericValidator(bool* val);
         // wxChoice, wxGauge, wxRadioBox, wxScrollBar, wxSlider, wxSpinButton
     wxGenericValidator(int* val);
     wxGenericValidator(bool* val);
         // wxChoice, wxGauge, wxRadioBox, wxScrollBar, wxSlider, wxSpinButton
     wxGenericValidator(int* val);

-    wxGenericValidator(float* val);
-    wxGenericValidator(double* val);

         // wxComboBox, wxTextCtrl, wxButton, wxStaticText (read-only)
     wxGenericValidator(wxString* val);
         // wxListBox, wxCheckListBox
         // wxComboBox, wxTextCtrl, wxButton, wxStaticText (read-only)
     wxGenericValidator(wxString* val);
         // wxListBox, wxCheckListBox


@@ -44,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(){}


@@ -70,13 +76,14 @@ protected:
 
     bool*       m_pBool;
     int*        m_pInt;
 
     bool*       m_pBool;
     int*        m_pInt;

-    float*      m_pFloat;
-    double*     m_pDouble;

     wxString*   m_pString;
     wxArrayInt* m_pArrayInt;
 #if wxUSE_DATETIME
     wxDateTime* m_pDateTime;
 #endif // wxUSE_DATETIME
     wxString*   m_pString;
     wxArrayInt* m_pArrayInt;
 #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)