Avoid cyclic includes by forward declaring wxColour.

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

diff --git a/include/wx/validate.h b/include/wx/validate.h
index e5a921100a7a9bd15a4cb41a3cea198e5f3abcb0..1e3f4df94ce43f0eb6d8a8193d1eeffd91b29634 100644 (file)
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -12,18 +12,14 @@
 #ifndef _WX_VALIDATE_H_
 #define _WX_VALIDATE_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "validate.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_VALIDATORS
 
 #include "wx/event.h"
 
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxWindowBase;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 
 /*
  A validator has up to three purposes:
@@ -37,7 +33,7 @@ class WXDLLEXPORT wxWindowBase;
  Note that wxValidator and derived classes use reference counting.
 */
 
-class WXDLLEXPORT wxValidator : public wxEvtHandler
+class WXDLLIMPEXP_CORE wxValidator : public wxEvtHandler
 {
 public:
     wxValidator();
@@ -50,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; }
@@ -69,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;
@@ -81,7 +77,7 @@ private:
     DECLARE_NO_COPY_CLASS(wxValidator)
 };
 
-WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
+extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;
 
 #define wxVALIDATOR_PARAM(val) val
 
@@ -90,7 +86,7 @@ WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
     // 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;
+    class WXDLLIMPEXP_FWD_CORE wxValidator;
     #define wxDefaultValidator (*((wxValidator *)NULL))
 
     // this macro allows to avoid warnings about unused parameters when