X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..2cce66352fc23859e991c2e7658dbf1cdf8c4183:/include/wx/x11/privx.h?ds=sidebyside diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h index ec522ff28d..bf8386d641 100644 --- a/include/wx/x11/privx.h +++ b/include/wx/x11/privx.h @@ -6,7 +6,7 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PRIVX_H_ @@ -26,10 +26,10 @@ #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 @@ -38,11 +38,11 @@ class wxRegion; 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(); } @@ -148,7 +148,7 @@ bool wxWindowIsVisible(Window win); bool wxDoSetShape( Display* xdisplay, Window xwindow, const wxRegion& region ); -class WXDLLEXPORT wxXVisualInfo +class WXDLLIMPEXP_CORE wxXVisualInfo { public: wxXVisualInfo();