Moved wxMacGetSystemEncFromFontEnc and wxMacGetFontEncFromSystemEnc to

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

diff --git a/src/common/validate.cpp b/src/common/validate.cpp
index bc40a4b82b0204dc20f9978636d56d777d462e93..64210336a3924aaf328792d885207c91bbc6f8e6 100644 (file)
--- a/src/common/validate.cpp
+++ b/src/common/validate.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "validate.h"
 #endif
 
 #pragma implementation "validate.h"
 #endif
 


@@ -32,18 +32,9 @@
 
 #include "wx/validate.h"
 
 
 #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;
-#else

 const wxValidator wxDefaultValidator;
 const wxValidator wxDefaultValidator;

-#endif

 
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
     IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)

-#endif

 
 // VZ: personally, I think TRUE would be more appropriate - these bells are
 //     _annoying_
 
 // VZ: personally, I think TRUE would be more appropriate - these bells are
 //     _annoying_