X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d2d8da1d89c195cb44f95f267989118e205c7bf..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/dcclient.h diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h index a70c424edb..c2a6fa43c8 100644 --- a/include/wx/gtk1/dcclient.h +++ b/include/wx/gtk1/dcclient.h @@ -10,7 +10,7 @@ #ifndef __GTKDCCLIENTH__ #define __GTKDCCLIENTH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -35,13 +35,14 @@ public: wxWindowDC(); wxWindowDC( wxWindow *win ); - ~wxWindowDC(); + virtual ~wxWindowDC(); virtual bool CanDrawBitmap() const { return TRUE; } virtual bool CanGetTextExtent() const { return TRUE; } -//protected: - virtual void DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE ); +protected: + virtual void DoGetSize(int *width, int *height) const; + virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE ); virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const; virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ); @@ -68,7 +69,7 @@ public: virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int logical_func = wxCOPY, bool useMask = FALSE ); + int logical_func = wxCOPY, bool useMask = FALSE, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ); virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y ); virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, @@ -78,6 +79,8 @@ public: wxCoord *descent = (wxCoord *) NULL, wxCoord *externalLeading = (wxCoord *) NULL, wxFont *theFont = (wxFont *) NULL) const; + +public: virtual wxCoord GetCharWidth() const; virtual wxCoord GetCharHeight() const; @@ -97,10 +100,6 @@ public: virtual void DestroyClippingRegion(); virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion ); -#if wxUSE_SPLINES - virtual void DoDrawSpline( wxList *points ); -#endif - // Resolution in pixels per logical inch virtual wxSize GetPPI() const; virtual int GetDepth() const; @@ -115,9 +114,17 @@ public: GdkGC *m_bgGC; GdkColormap *m_cmap; bool m_isMemDC; + bool m_isScreenDC; wxWindow *m_owner; wxRegion m_currentClippingRegion; wxRegion m_paintClippingRegion; + + // PangoContext stuff for GTK 2.0 +#ifdef __WXGTK20__ + PangoContext *m_context; + PangoLayout *m_layout; + PangoFontDescription *m_fontdesc; +#endif void SetUpDC(); void Destroy(); @@ -130,31 +137,34 @@ private: }; //----------------------------------------------------------------------------- -// wxPaintDC +// wxClientDC //----------------------------------------------------------------------------- -class wxPaintDC : public wxWindowDC +class wxClientDC : public wxWindowDC { public: - wxPaintDC(); - wxPaintDC( wxWindow *win ); + wxClientDC() { } + wxClientDC( wxWindow *win ); + +protected: + virtual void DoGetSize(int *width, int *height) const; private: - DECLARE_DYNAMIC_CLASS(wxPaintDC) + DECLARE_DYNAMIC_CLASS(wxClientDC) }; //----------------------------------------------------------------------------- -// wxClientDC +// wxPaintDC //----------------------------------------------------------------------------- -class wxClientDC : public wxWindowDC +class wxPaintDC : public wxClientDC { public: - wxClientDC(); - wxClientDC( wxWindow *win ); + wxPaintDC() { } + wxPaintDC( wxWindow *win ); private: - DECLARE_DYNAMIC_CLASS(wxClientDC) + DECLARE_DYNAMIC_CLASS(wxPaintDC) }; #endif // __GTKDCCLIENTH__