X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cd0b8c5b5a320bba065c4da306be3687d144157..a6c255cbc0a0f6757b9bef432aa30becd1b3da91:/include/wx/x11/dcclient.h diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h index bfbce74123..af67b3ddf2 100644 --- a/include/wx/x11/dcclient.h +++ b/include/wx/x11/dcclient.h @@ -12,7 +12,7 @@ #ifndef _WX_DCCLIENT_H_ #define _WX_DCCLIENT_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dcclient.h" #endif @@ -46,7 +46,7 @@ public: protected: virtual void DoGetSize(int *width, int *height) const; - virtual void DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE ); + virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE ); virtual bool DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const; virtual void DoDrawPoint(wxCoord x, wxCoord y); @@ -114,6 +114,7 @@ public: virtual wxSize GetPPI() const; virtual void DestroyClippingRegion(); + WXWindow GetWindow() const { return m_window; } protected: // implementation @@ -132,6 +133,11 @@ protected: wxRegion m_currentClippingRegion; wxRegion m_paintClippingRegion; +#if wxUSE_UNICODE + PangoContext *m_context; + PangoFontDescription *m_fontdesc; +#endif + void SetUpDC(); void Destroy(); void ComputeScaleAndOrigin();