Fixes for Unicode build.

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

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

-// 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/defs.h"
+
+#if wxUSE_VALIDATORS
+

 #include "wx/event.h"
 
 #include "wx/event.h"
 

+class WXDLLEXPORT wxWindow;

 class WXDLLEXPORT wxWindowBase;
 
 /*
 class WXDLLEXPORT wxWindowBase;
 
 /*


@@ -49,7 +54,7 @@ public:
 
     // Called when the value in the window must be validated.
     // This function can pop up an error message.
 
     // Called when the value in the window must be validated.
     // This function can pop up an error message.

-    virtual bool Validate(wxWindowBase *WXUNUSED(parent)) { return FALSE; };
+    virtual bool Validate(wxWindow *WXUNUSED(parent)) { return FALSE; };

 
     // Called to transfer data to the window
     virtual bool TransferToWindow() { return FALSE; }
 
     // Called to transfer data to the window
     virtual bool TransferToWindow() { return FALSE; }


@@ -58,7 +63,7 @@ public:
     virtual bool TransferFromWindow() { return FALSE; };
 
     // accessors
     virtual bool TransferFromWindow() { return FALSE; };
 
     // accessors

-    wxWindowBase *GetWindow() const { return m_validatorWindow; }
+    wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; }

     void SetWindow(wxWindowBase *win) { m_validatorWindow = win; }
 
     // validators beep by default if invalid key is pressed, these functions
     void SetWindow(wxWindowBase *win) { m_validatorWindow = win; }
 
     // validators beep by default if invalid key is pressed, these functions


@@ -73,9 +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
-    // _WX_VALIDATEH__
+#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_
+