X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..a552d1201fd615730d7c0662a65df306fe18c274:/include/wx/validate.h?ds=sidebyside

diff --git a/include/wx/validate.h b/include/wx/validate.h
index abc83188e1..f45efe1376 100644
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        validate.h
+// Name:        wx/validate.h
 // Purpose:     wxValidator class
 // Author:      Julian Smart
 // Modified by:
@@ -9,21 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_VALIDATEH__
-#define _WX_VALIDATEH__
+#ifndef _WX_VALIDATE_H_
+#define _WX_VALIDATE_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "validate.h"
-#endif
+#include "wx/defs.h"
 
-#if defined(wxUSE_VALIDATORS) && !wxUSE_VALIDATORS
-    // wxWindows is compiled without support for wxValidator, but we still
-    // want to be able to pass wxDefaultValidator to the functions which take
-    // a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS"
-    // everywhere
-    class WXDLLEXPORT wxValidator;
-    #define wxDefaultValidator (*((wxValidator *)NULL))
-#else // wxUSE_VALIDATORS
+#if wxUSE_VALIDATORS
 
 #include "wx/event.h"
 
@@ -55,17 +46,17 @@ public:
     virtual wxObject *Clone() const
         { return (wxValidator *)NULL; }
     bool Copy(const wxValidator& val)
-        { m_validatorWindow = val.m_validatorWindow; return TRUE; }
+        { m_validatorWindow = val.m_validatorWindow; return true; }
 
     // Called when the value in the window must be validated.
     // This function can pop up an error message.
-    virtual bool Validate(wxWindow *WXUNUSED(parent)) { return FALSE; };
+    virtual bool Validate(wxWindow *WXUNUSED(parent)) { return false; };
 
     // Called to transfer data to the window
-    virtual bool TransferToWindow() { return FALSE; }
+    virtual bool TransferToWindow() { return false; }
 
     // Called to transfer data from the window
-    virtual bool TransferFromWindow() { return FALSE; };
+    virtual bool TransferFromWindow() { return false; };
 
     // accessors
     wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; }
@@ -74,7 +65,7 @@ public:
     // validators beep by default if invalid key is pressed, these functions
     // allow to change it
     static bool IsSilent() { return ms_isSilent; }
-    static void SetBellOnError(bool doIt = TRUE) { ms_isSilent = doIt; }
+    static void SetBellOnError(bool doIt = true) { ms_isSilent = doIt; }
 
 protected:
     wxWindowBase *m_validatorWindow;
@@ -86,9 +77,22 @@ private:
     DECLARE_NO_COPY_CLASS(wxValidator)
 };
 
-WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
+extern WXDLLEXPORT_DATA(const wxValidator) wxDefaultValidator;
+
+#define wxVALIDATOR_PARAM(val) val
+
+#else // !wxUSE_VALIDATORS
+    // wxWidgets is compiled without support for wxValidator, but we still
+    // want to be able to pass wxDefaultValidator to the functions which take
+    // a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS"
+    // everywhere
+    class WXDLLEXPORT wxValidator;
+    #define wxDefaultValidator (*((wxValidator *)NULL))
+
+    // this macro allows to avoid warnings about unused parameters when
+    // wxUSE_VALIDATORS == 0
+    #define wxVALIDATOR_PARAM(val)
+#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
 
-#endif // wxUSE_VALIDATORS
+#endif // _WX_VALIDATE_H_
 
-#endif
-    // _WX_VALIDATEH__