Rebake from clean wx tree.

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

diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h
index 7a3473593aa36f4cb945c9d35f49d7c82f7c6974..4767a9431d39ed2644ecad63f522b77c0f788b4b 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"
 
+#if defined( __cplusplus ) && defined( __VMS )
+#pragma message disable nosimpint
+#endif
 #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
@@ -31,11 +38,11 @@ class wxWindow;
 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[];
-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(); }
@@ -60,9 +67,7 @@ void wxAllocNearestColor(Display *display,Colormap colormap,XColor *xcolor);
 void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor);
 
 // For debugging
-#ifdef __WXDEBUG__
 wxString wxGetXEventName(XEvent& event);
-#endif
 
 // Is the window visible?
 bool wxWindowIsVisible(Window win);
@@ -135,5 +140,37 @@ bool wxWindowIsVisible(Window win);
 #define XFontStructGetAscent(f) f->ascent
 #endif
 
-#endif
-// _WX_PRIVX_H_
+// ----------------------------------------------------------------------------
+// Misc functions
+// ----------------------------------------------------------------------------
+
+bool wxDoSetShape( Display* xdisplay, Window xwindow, const wxRegion& region );
+
+class WXDLLIMPEXP_CORE wxXVisualInfo
+{
+public:
+    wxXVisualInfo();
+    ~wxXVisualInfo();
+    void Init( Display* dpy, XVisualInfo* visualInfo );
+
+    int                   m_visualType;   // TrueColor, DirectColor etc.
+    int                   m_visualDepth;
+    int                   m_visualColormapSize;
+    void                 *m_visualColormap;
+    int                   m_visualScreen;
+    unsigned long         m_visualRedMask;
+    unsigned long         m_visualGreenMask;
+    unsigned long         m_visualBlueMask;
+    int                   m_visualRedShift;
+    int                   m_visualGreenShift;
+    int                   m_visualBlueShift;
+    int                   m_visualRedPrec;
+    int                   m_visualGreenPrec;
+    int                   m_visualBluePrec;
+
+    unsigned char        *m_colorCube;
+};
+
+bool wxFillXVisualInfo( wxXVisualInfo* vi, Display* dpy );
+
+#endif // _WX_PRIVX_H_