Fixes for Unicode build.

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

diff --git a/include/wx/validate.h b/include/wx/validate.h
index 25a4c5894aa06ea27dc58c1a70b5cff13ee2f13b..e5a921100a7a9bd15a4cb41a3cea198e5f3abcb0 100644 (file)
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -1,28 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        validate.h
+// Name:        wx/validate.h

 // Purpose:     wxValidator class
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Purpose:     wxValidator class
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_VALIDATEH__
-#define _WX_VALIDATEH__
+#ifndef _WX_VALIDATE_H_
+#define _WX_VALIDATE_H_

 
 

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

     #pragma interface "validate.h"
 #endif
 
     #pragma interface "validate.h"
 #endif
 

-#include "wx/event.h"
+#include "wx/defs.h"

 
 

-#if defined(wxUSE_VALIDATORS) && !wxUSE_VALIDATORS
-    // wxWindows is compiled without support for wxValidator
-    class WXDLLEXPORT wxValidator;
-    #define wxDefaultValidator (*((wxValidator *)NULL))
-#else // wxUSE_VALIDATORS
+#if wxUSE_VALIDATORS
+
+#include "wx/event.h"

 
 class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxWindowBase;
 
 class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxWindowBase;


@@ -80,11 +78,25 @@ private:
     static bool ms_isSilent;
 
     DECLARE_DYNAMIC_CLASS(wxValidator)
     static bool ms_isSilent;
 
     DECLARE_DYNAMIC_CLASS(wxValidator)

+    DECLARE_NO_COPY_CLASS(wxValidator)

 };
 
 WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
 
 };
 
 WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
 

-#endif // wxUSE_VALIDATORS
+#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 // _WX_VALIDATE_H_

 
 

-#endif
-    // _WX_VALIDATEH__