X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6de97a3b945c99fb942209df48be26f43c1b436d..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/common/validate.cpp?ds=sidebyside

diff --git a/src/common/validate.cpp b/src/common/validate.cpp
index c5eb5c4ca2..50d072c6b2 100644
--- a/src/common/validate.cpp
+++ b/src/common/validate.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -17,28 +17,46 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/wx.h"
+  #include "wx/defs.h"
+#endif
+
+#if wxUSE_VALIDATORS
+
+#ifndef WX_PRECOMP
+  #include "wx/window.h"
 #endif
 
 #include "wx/validate.h"
 
+#if defined(__VISAGECPP__)
+// treated as a static global class by VA and thus cannot use in this form.
+// Defined as a pointer and then explicity allocated and deallocated
+// by user if desired
+const wxValidator* wxDefaultValidator = NULL;
+#else
 const wxValidator wxDefaultValidator;
+#endif
 
 #if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
+    IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
 #endif
 
-wxValidator::wxValidator(void)
+// VZ: personally, I think TRUE would be more appropriate - these bells are
+//     _annoying_
+bool wxValidator::ms_isSilent = FALSE;
+
+wxValidator::wxValidator()
 {
-  m_validatorWindow = NULL;
+  m_validatorWindow = (wxWindow *) NULL;
 }
 
 wxValidator::~wxValidator()
 {
 }
 
-
+#endif
+  // wxUSE_VALIDATORS