Some wxUniv compile fixes

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

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 26422a77d81ca8e7286c9321b7c2450d58e8ae78..942110e65baa20568fed985b09c23fa237d2ab46 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -9,13 +9,17 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __VALTEXTH__
-#define __VALTEXTH__
+#ifndef _WX_VALTEXTH__
+#define _WX_VALTEXTH__

 
 #ifdef __GNUG__
 #pragma interface "valtext.h"
 #endif
 
 
 #ifdef __GNUG__
 #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,7 +34,7 @@ class WXDLLEXPORT wxTextValidator: public wxValidator
 {
 DECLARE_DYNAMIC_CLASS(wxTextValidator)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxTextValidator)
 public:

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

   wxTextValidator(const wxTextValidator& val);
 
   ~wxTextValidator();
   wxTextValidator(const wxTextValidator& val);
 
   ~wxTextValidator();


@@ -39,7 +43,7 @@ public:
   // 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).
   // 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); }
+  virtual wxObject *Clone(void) const { return new wxTextValidator(*this); }

   bool Copy(const wxTextValidator& val);
 
   // Called when the value in the window must be validated.
   bool Copy(const wxTextValidator& val);
 
   // Called when the value in the window must be validated.


@@ -75,3 +79,7 @@ protected:
 };
 
 #endif
 };
 
 #endif

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