X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ce8d6a2b0fec3ce3f6e838445fdea3445d2ce8d..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/x11/privx.h?ds=sidebyside diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h index 30862c0b35..7cfd8616ad 100644 --- a/include/wx/x11/privx.h +++ b/include/wx/x11/privx.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: privx.h +// Name: wx/x11/privx.h // Purpose: Private declarations common to X11 and Motif ports // Author: Julian Smart // Modified by: @@ -16,26 +16,30 @@ #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 // ---------------------------------------------------------------------------- -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,12 +64,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); #if wxUSE_NANOX #define XEventGetWindow(event) event->general.wid @@ -135,7 +134,13 @@ bool wxWindowIsVisible(Window win); #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(); @@ -156,7 +161,7 @@ public: int m_visualRedPrec; int m_visualGreenPrec; int m_visualBluePrec; - + unsigned char *m_colorCube; };