Warning and build fixes focused with Borland and Watcom.

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

diff --git a/src/common/validate.cpp b/src/common/validate.cpp
index 6932875a5c8d7dcf7336d16c6df2a22f218622da..f05b8d47a824069048234a1c35dbdc7d86c6cb14 100644 (file)
--- a/src/common/validate.cpp
+++ b/src/common/validate.cpp
@@ -5,36 +5,40 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-    #pragma implementation "validate.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "validate.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #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"
 
 const wxValidator wxDefaultValidator;
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
-#endif
 
-// VZ: personally, I think TRUE would be more appropriate - these bells are
+// VZ: personally, I think true would be more appropriate - these bells are
 //     _annoying_
-bool wxValidator::ms_isSilent = FALSE;
+bool wxValidator::ms_isSilent = false;
 
 wxValidator::wxValidator()
 {
@@ -45,4 +49,5 @@ wxValidator::~wxValidator()
 {
 }
 
-
+#endif
+  // wxUSE_VALIDATORS