Add wxHAS_BITMAPTOGGLEBUTTON and test for it in the unit test.

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

diff --git a/include/wx/validate.h b/include/wx/validate.h
index 7bf0f2b1080e5c60746d4a3f153c95cbd7068fc3..f6832d16d154a6d1149dad36f368f488cd93ea95 100644 (file)
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -6,24 +6,20 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VALIDATE_H_
 #define _WX_VALIDATE_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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"
 
 #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:
 
 /*
  A validator has up to three purposes:


@@ -37,7 +33,7 @@ class WXDLLEXPORT wxWindowBase;
  Note that wxValidator and derived classes use reference counting.
 */
 
  Note that wxValidator and derived classes use reference counting.
 */
 

-class WXDLLEXPORT wxValidator : public wxEvtHandler
+class WXDLLIMPEXP_CORE wxValidator : public wxEvtHandler

 {
 public:
     wxValidator();
 {
 public:
     wxValidator();


@@ -48,28 +44,41 @@ public:
     // 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 wxObject *Clone() const
     // 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 wxObject *Clone() const

-        { return (wxValidator *)NULL; }
+        { return NULL; }

     bool Copy(const wxValidator& val)
     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.
 
     // 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
 
     // Called to transfer data to the window

-    virtual bool TransferToWindow() { return FALSE; }
+    virtual bool TransferToWindow() { return false; }

 
     // Called to transfer data from the window
 
     // 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; }
     void SetWindow(wxWindowBase *win) { m_validatorWindow = win; }
 
 
     // accessors
     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
-    // allow to change it
+    // validators beep by default if invalid key is pressed, this function
+    // allows to change this
+    static void SuppressBellOnError(bool suppress = true)
+        { ms_isSilent = suppress; }
+
+    // test if beep is currently disabled

     static bool IsSilent() { return ms_isSilent; }
     static bool IsSilent() { return ms_isSilent; }

-    static void SetBellOnError(bool doIt = TRUE) { ms_isSilent = doIt; }
+
+    // this function is deprecated because it handled its parameter
+    // unnaturally: it disabled the bell when it was true, not false as could
+    // be expected; use SuppressBellOnError() instead
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED_INLINE(
+        static void SetBellOnError(bool doIt = true),
+        ms_isSilent = doIt;
+    )
+#endif

 
 protected:
     wxWindowBase *m_validatorWindow;
 
 protected:
     wxWindowBase *m_validatorWindow;


@@ -78,10 +87,10 @@ private:
     static bool ms_isSilent;
 
     DECLARE_DYNAMIC_CLASS(wxValidator)
     static bool ms_isSilent;
 
     DECLARE_DYNAMIC_CLASS(wxValidator)

-    DECLARE_NO_COPY_CLASS(wxValidator)
+    wxDECLARE_NO_COPY_CLASS(wxValidator);

 };
 
 };
 

-WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
+extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;

 
 #define wxVALIDATOR_PARAM(val) val
 
 
 #define wxVALIDATOR_PARAM(val) val
 


@@ -90,8 +99,8 @@ 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
     // 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))
+    class WXDLLIMPEXP_FWD_CORE wxValidator;
+    #define wxDefaultValidator (*reinterpret_cast<wxValidator*>(NULL))

 
     // this macro allows to avoid warnings about unused parameters when
     // wxUSE_VALIDATORS == 0
 
     // this macro allows to avoid warnings about unused parameters when
     // wxUSE_VALIDATORS == 0