put wxUSE_DATAVIEWCTRL in alphabetical order

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

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 0a047e199a9a364e975979530a3e34f9cc172f17..394c160fcfe71aa482ef6655b9d3914f460b0ee3 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -12,10 +12,6 @@
 #ifndef _WX_VALTEXTH__
 #define _WX_VALTEXTH__
 
 #ifndef _WX_VALTEXTH__
 #define _WX_VALTEXTH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "valtext.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
 #include "wx/defs.h"
 
 #if wxUSE_VALIDATORS && wxUSE_TEXTCTRL


@@ -57,7 +53,7 @@ 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
     virtual bool TransferFromWindow();
 
     // ACCESSORS


@@ -66,10 +62,10 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_4
     wxDEPRECATED( void SetIncludeList(const wxStringList& list) );
 
 #if WXWIN_COMPATIBILITY_2_4
     wxDEPRECATED( void SetIncludeList(const wxStringList& list) );

-    wxDEPRECATED( inline wxStringList& GetIncludeList() );
+    wxDEPRECATED( wxStringList& GetIncludeList() );

 
     wxDEPRECATED( void SetExcludeList(const wxStringList& list) );
 
     wxDEPRECATED( void SetExcludeList(const wxStringList& list) );

-    wxDEPRECATED( inline wxStringList& GetExcludeList() );
+    wxDEPRECATED( wxStringList& GetExcludeList() );

 
     wxDEPRECATED( bool IsInCharIncludeList(const wxString& val) );
     wxDEPRECATED( bool IsNotInCharExcludeList(const wxString& val) );
 
     wxDEPRECATED( bool IsInCharIncludeList(const wxString& val) );
     wxDEPRECATED( bool IsNotInCharExcludeList(const wxString& val) );


@@ -106,8 +102,6 @@ protected:
                      _T("No window associated with validator") );
         wxCHECK_MSG( m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)), false,
                      _T("wxTextValidator is only for wxTextCtrl's") );
                      _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;
     }
 
         return true;
     }