compilation fix (no C++ comments in C files, include/wx/expr.hsrc/msw/textctrl.cpp...

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 08e4575b5725470b6e083c074f69d0bed9c20deb..73b50a162bd9e2822951a72eeaa4283c8c105ab0 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -172,7 +172,7 @@ WXDLLEXPORT int wxKill(long pid, wxSignal sig = wxSIGTERM);
 // If no command then just the shell
 WXDLLEXPORT bool wxShell(const wxString& command = wxEmptyString);
 
-// Sleep for nSecs seconds under UNIX, do nothing under Windows
+// Sleep for nSecs seconds
 WXDLLEXPORT void wxSleep(int nSecs);
 
 // Sleep for a given amount of milliseconds
@@ -354,7 +354,14 @@ WXDLLEXPORT void wxRedirectIOToConsole();
 
 #ifdef __X__
 
+#ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
+               // The resulting warnings are switched off here
+#pragma message disable nosimpint
+#endif
 #include <X11/Xlib.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
 #define wxMAX_RGB           0xff
 #define wxMAX_SV            1000
@@ -377,38 +384,6 @@ void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor);
 
 #endif //__X__
 
-// ----------------------------------------------------------------------------
-// font-related functions (X and GTK)
-// ----------------------------------------------------------------------------
-
-#if defined(__X__) || defined(__WXGTK__)
-
-#ifdef __X__
-    typedef XFontStruct *wxNativeFont;
-#else // GDK
-    typedef GdkFont *wxNativeFont;
-#endif
-
-#include "wx/font.h"    // for wxFontEncoding
-    
-// returns the handle of the nearest available font or 0
-extern wxNativeFont wxLoadQueryNearestFont(int pointSize,
-                                           int family,
-                                           int style,
-                                           int weight,
-                                           bool underlined,
-                                           const wxString &facename,
-                                           wxFontEncoding encoding);
-
-// fills xencoding and xregistry with the X font spec parts for the given
-// encoding ('*' if encoding == wxFONTENCODING_SYSTEM) and returns TRUE if any
-// fonts with this encoding exist or FALSE if it's unknown (it does *not* mean
-// that they don't exist!)
-extern bool wxGetXFontEncoding(wxFontEncoding encoding,
-                               wxString *xencoding, wxString *xregistry);
-
-#endif // X || GTK
-
 #endif // wxUSE_GUI
 
 #endif