X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/x11/privx.h?ds=inline diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h index ec522ff28d..7cfd8616ad 100644 --- a/include/wx/x11/privx.h +++ b/include/wx/x11/privx.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: privx.h +// Name: wx/x11/privx.h // Purpose: Private declarations common to X11 and Motif ports // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PRIVX_H_ @@ -26,23 +26,20 @@ #pragma message enable nosimpint #endif -class wxMouseEvent; -class wxKeyEvent; -class wxWindow; -class wxRegion; +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(); } @@ -67,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 @@ -148,7 +140,7 @@ bool wxWindowIsVisible(Window win); bool wxDoSetShape( Display* xdisplay, Window xwindow, const wxRegion& region ); -class WXDLLEXPORT wxXVisualInfo +class WXDLLIMPEXP_CORE wxXVisualInfo { public: wxXVisualInfo(); @@ -169,7 +161,7 @@ public: int m_visualRedPrec; int m_visualGreenPrec; int m_visualBluePrec; - + unsigned char *m_colorCube; };