Add SetFocusIgnoringChildren() to wxControlContainer. This

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

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 42b08aa0bfd05a18c745461db2ff85031649970f..84afe2601e2178ba28a89f690a221e4a4ae248fa 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -6,19 +6,19 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VALTEXTH__
 #define _WX_VALTEXTH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VALTEXTH__
 #define _WX_VALTEXTH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "valtext.h"
 #endif
 
 #include "wx/defs.h"
 
 #pragma interface "valtext.h"
 #endif
 
 #include "wx/defs.h"
 

-#if wxUSE_VALIDATORS
+#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL

 
 #include "wx/textctrl.h"
 #include "wx/validate.h"
 
 #include "wx/textctrl.h"
 #include "wx/validate.h"


@@ -41,7 +41,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();
+    ~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.


@@ -86,14 +86,14 @@ protected:
 
     bool CheckValidator() const
     {
 
     bool CheckValidator() const
     {

-        wxCHECK_MSG( m_validatorWindow, FALSE,
+        wxCHECK_MSG( m_validatorWindow, false,

                      _T("No window associated with validator") );
                      _T("No window associated with validator") );

-        wxCHECK_MSG( m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)), FALSE,
+        wxCHECK_MSG( m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)), false,

                      _T("wxTextValidator is only for wxTextCtrl's") );
                      _T("wxTextValidator is only for wxTextCtrl's") );

-        wxCHECK_MSG( m_stringValue, FALSE,
+        wxCHECK_MSG( m_stringValue, false,

                      _T("No variable storage for validator") );
 
                      _T("No variable storage for validator") );
 

-        return TRUE;
+        return true;

     }
 
 private:
     }
 
 private:


@@ -106,7 +106,7 @@ private:
 };
 
 #endif
 };
 
 #endif

-  // wxUSE_VALIDATORS
+  // wxUSE_VALIDATORS && wxUSE_TEXTCTRL

 
 #endif
   // _WX_VALTEXTH__
 
 #endif
   // _WX_VALTEXTH__