Committing in .

[wxWidgets.git] / src / common / validate.cpp

diff --git a/src/common/validate.cpp b/src/common/validate.cpp
index c5eb5c4ca2286910bd1da6ed9f3237ea6b0d8bb6..50d072c6b28c6ea975a717bdd48eac65f09e721e 100644 (file)
--- 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
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,28 +17,46 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #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"
 
 #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;
 const wxValidator wxDefaultValidator;

+#endif

 
 #if !USE_SHARED_LIBRARY
 
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
+    IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)

 #endif
 
 #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()
 {
 }
 
 }
 
 wxValidator::~wxValidator()
 {
 }
 

-
+#endif
+  // wxUSE_VALIDATORS