X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/gtk/dcclient.h diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index 752fd09462..369deee2fd 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -10,39 +10,34 @@ #ifndef __GTKDCCLIENTH__ #define __GTKDCCLIENTH__ -#ifdef __GNUG__ -#pragma interface -#endif - #include "wx/dc.h" -#include "wx/window.h" +#include "wx/region.h" -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxWindowDC; -class wxPaintDC; -class wxClientDC; +class WXDLLIMPEXP_FWD_CORE wxWindow; //----------------------------------------------------------------------------- // wxWindowDC //----------------------------------------------------------------------------- -class wxWindowDC : public wxDC +#if wxUSE_NEW_DC +class WXDLLIMPEXP_CORE wxGTKWindowImplDC : public wxGTKImplDC +#else +#define wxGTKWindowImplDC wxWindowDC +class WXDLLIMPEXP_CORE wxWindowDC : public wxDC +#endif { public: - wxWindowDC(); - wxWindowDC( wxWindow *win ); + wxGTKWindowImplDC(); + wxGTKWindowImplDC( wxWindow *win ); - ~wxWindowDC(); + virtual ~wxGTKWindowImplDC(); - virtual bool CanDrawBitmap() const { return TRUE; } - virtual bool CanGetTextExtent() const { return TRUE; } + virtual bool CanDrawBitmap() const { return true; } + virtual bool CanGetTextExtent() const { return true; } 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 x1, wxCoord y1, wxColour *col ) const; virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ); @@ -65,11 +60,11 @@ protected: virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ); virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y, - bool useMask = FALSE ); + bool useMask = false ); 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,7 +73,11 @@ protected: wxCoord *width, wxCoord *height, wxCoord *descent = (wxCoord *) NULL, wxCoord *externalLeading = (wxCoord *) NULL, - wxFont *theFont = (wxFont *) NULL) const; + const wxFont *theFont = (wxFont *) NULL) const; + virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const; + virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); + virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion ); + public: virtual wxCoord GetCharWidth() const; @@ -96,14 +95,17 @@ public: virtual void SetBackgroundMode( int mode ); virtual void SetPalette( const wxPalette& palette ); - virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); virtual void DestroyClippingRegion(); - virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion ); // Resolution in pixels per logical inch virtual wxSize GetPPI() const; virtual int GetDepth() const; + // overrriden here for RTL + virtual void SetDeviceOrigin( wxCoord x, wxCoord y ); + virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp ); + +// protected: // implementation // -------------- @@ -118,50 +120,62 @@ public: wxWindow *m_owner; wxRegion m_currentClippingRegion; wxRegion m_paintClippingRegion; -#ifdef __WXGTK20__ + + // PangoContext stuff for GTK 2.0 PangoContext *m_context; + PangoLayout *m_layout; PangoFontDescription *m_fontdesc; -#endif void SetUpDC(); void Destroy(); - void ComputeScaleAndOrigin(); + + virtual void ComputeScaleAndOrigin(); - GdkWindow *GetWindow() { return m_window; } + virtual GdkWindow *GetGDKWindow() const { return m_window; } private: - DECLARE_DYNAMIC_CLASS(wxWindowDC) + DECLARE_DYNAMIC_CLASS(wxGTKWindowImplDC) }; //----------------------------------------------------------------------------- // wxClientDC //----------------------------------------------------------------------------- -class wxClientDC : public wxWindowDC +#if wxUSE_NEW_DC +class WXDLLIMPEXP_CORE wxGTKClientImplDC : public wxGTKWindowImplDC +#else +#define wxGTKClientImplDC wxClientDC +class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC +#endif { public: - wxClientDC(); - wxClientDC( wxWindow *win ); + wxGTKClientImplDC() { } + wxGTKClientImplDC( wxWindow *win ); protected: virtual void DoGetSize(int *width, int *height) const; private: - DECLARE_DYNAMIC_CLASS(wxClientDC) + DECLARE_DYNAMIC_CLASS(wxGTKClientImplDC) }; //----------------------------------------------------------------------------- // wxPaintDC //----------------------------------------------------------------------------- -class wxPaintDC : public wxClientDC +#if wxUSE_NEW_DC +class WXDLLIMPEXP_CORE wxGTKPaintImplDC : public wxGTKClientImplDC +#else +#define wxGTKPaintImplDC wxPaintDC +class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC +#endif { public: - wxPaintDC() { } - wxPaintDC( wxWindow *win ); + wxGTKPaintImplDC() { } + wxGTKPaintImplDC( wxWindow *win ); private: - DECLARE_DYNAMIC_CLASS(wxPaintDC) + DECLARE_DYNAMIC_CLASS(wxGTKPaintImplDC) }; #endif // __GTKDCCLIENTH__