define wxHAS_RAW_BITMAP for wxDFB

[wxWidgets.git] / include / wx / x11 / privx.h

diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h
index 30862c0b35ff113ba523decd278a1c4b730139f5..bf8386d641ae30c9c2468ab77997152c1f6ae2f5 100644 (file)
--- a/include/wx/x11/privx.h
+++ b/include/wx/x11/privx.h
@@ -16,13 +16,20 @@
 #include "wx/utils.h"
 #include "wx/colour.h"
 
 #include "wx/utils.h"
 #include "wx/colour.h"
 

+#if defined( __cplusplus ) && defined( __VMS )
+#pragma message disable nosimpint
+#endif

 #include "X11/Xlib.h"
 #include "X11/Xatom.h"
 #include "X11/Xutil.h"
 #include "X11/Xlib.h"
 #include "X11/Xatom.h"
 #include "X11/Xutil.h"

+#if defined( __cplusplus ) && defined( __VMS )
+#pragma message enable nosimpint
+#endif

 
 

-class wxMouseEvent;
-class wxKeyEvent;
-class wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxRegion;

 
 // ----------------------------------------------------------------------------
 // key events related functions
 
 // ----------------------------------------------------------------------------
 // key events related functions


@@ -31,11 +38,11 @@ class wxWindow;
 extern int wxCharCodeXToWX(KeySym keySym);
 extern KeySym wxCharCodeWXToX(int id);
 
 extern int wxCharCodeXToWX(KeySym keySym);
 extern KeySym wxCharCodeWXToX(int id);
 

-int wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap);
+WXPixel wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap);

 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
 extern XColor g_itemColors[];
 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
 extern XColor g_itemColors[];

-extern int wxComputeColours (Display *display, wxColour * back, wxColour * fore);
+extern int wxComputeColours (Display *display, const wxColour * back, const wxColour * fore);

 
 // For convenience
 inline Display* wxGlobalDisplay() { return (Display*) wxGetDisplay(); }
 
 // For convenience
 inline Display* wxGlobalDisplay() { return (Display*) wxGetDisplay(); }


@@ -135,7 +142,13 @@ bool wxWindowIsVisible(Window win);
 #define XFontStructGetAscent(f) f->ascent
 #endif
 
 #define XFontStructGetAscent(f) f->ascent
 #endif
 

-class WXDLLEXPORT wxXVisualInfo
+// ----------------------------------------------------------------------------
+// Misc functions
+// ----------------------------------------------------------------------------
+
+bool wxDoSetShape( Display* xdisplay, Window xwindow, const wxRegion& region );
+
+class WXDLLIMPEXP_CORE wxXVisualInfo

 {
 public:
     wxXVisualInfo();
 {
 public:
     wxXVisualInfo();