X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..831dd3a1e8b8d8e21518a1344b736524692f5fb7:/include/wx/x11/palette.h diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h index c34767f8ce..975ec7584c 100644 --- a/include/wx/x11/palette.h +++ b/include/wx/x11/palette.h @@ -12,7 +12,7 @@ #ifndef _WX_PALETTE_H_ #define _WX_PALETTE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "palette.h" #endif @@ -69,7 +69,7 @@ public: bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; } bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; } - // Motif-specific + // X-specific WXColormap GetXColormap(WXDisplay* display = NULL) const; bool TransferBitmap(void *data, int depth, int size); bool TransferBitmap8(unsigned char *data, unsigned long size, void *dest, unsigned int bpp);