X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab171e95021482a8a0c0e24ebe050fa0181e7af0..a516284f67e1910fc6dc5364b289340332d0d35f:/include/wx/gtk/dcclient.h?ds=sidebyside diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index 065e32a235..18451dae44 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcclient.h +// Name: wx/gtk/dcclient.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,44 +7,33 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKDCCLIENTH__ -#define __GTKDCCLIENTH__ +#ifndef _WX_GTKDCCLIENT_H_ +#define _WX_GTKDCCLIENT_H_ -#include "wx/dc.h" +#include "wx/gtk/dc.h" +#include "wx/dcclient.h" #include "wx/region.h" class WXDLLIMPEXP_FWD_CORE wxWindow; //----------------------------------------------------------------------------- -// wxWindowDC +// wxWindowDCImpl //----------------------------------------------------------------------------- -#if wxUSE_NEW_DC -class WXDLLIMPEXP_CORE wxGTKWindowImplDC : public wxGTKImplDC -#else -#define wxGTKWindowImplDC wxWindowDC -class WXDLLIMPEXP_CORE wxWindowDC : public wxDC -#endif +class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxGTKDCImpl { public: + wxWindowDCImpl( wxDC *owner ); + wxWindowDCImpl( wxDC *owner, wxWindow *win ); - -#if wxUSE_NEW_DC - wxGTKWindowImplDC( wxDC *owner ); - wxGTKWindowImplDC( wxDC *owner, wxWindow *win ); -#else - wxWindowDC(); - wxWindowDC( wxWindow *win ); -#endif - - virtual ~wxGTKWindowImplDC(); + virtual ~wxWindowDCImpl(); virtual bool CanDrawBitmap() const { return true; } virtual bool CanGetTextExtent() const { return true; } -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 DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, + wxFloodFillStyle style=wxFLOOD_SURFACE ); virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const; virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ); @@ -59,7 +48,7 @@ protected: wxCoord xoffset, wxCoord yoffset); virtual void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, - int fillStyle = wxODDEVEN_RULE); + wxPolygonFillMode fillStyle = wxODDEVEN_RULE); virtual void DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); virtual void DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0 ); @@ -69,24 +58,25 @@ protected: virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y, bool useMask = false ); - virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, + virtual bool DoBlit( wxCoord xdest, wxCoord ydest, + wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int logical_func = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ); + wxRasterOperationMode 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, double angle); virtual void DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height, - wxCoord *descent = (wxCoord *) NULL, - wxCoord *externalLeading = (wxCoord *) NULL, - const wxFont *theFont = (wxFont *) NULL) const; + wxCoord *descent = NULL, + wxCoord *externalLeading = NULL, + const wxFont *theFont = 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 ); - + virtual void DoSetDeviceClippingRegion( const wxRegion ®ion ); -public: virtual wxCoord GetCharWidth() const; virtual wxCoord GetCharHeight() const; @@ -96,7 +86,7 @@ public: virtual void SetPen( const wxPen &pen ); virtual void SetBrush( const wxBrush &brush ); virtual void SetBackground( const wxBrush &brush ); - virtual void SetLogicalFunction( int function ); + virtual void SetLogicalFunction( wxRasterOperationMode function ); virtual void SetTextForeground( const wxColour &col ); virtual void SetTextBackground( const wxColour &col ); virtual void SetBackgroundMode( int mode ); @@ -116,14 +106,13 @@ public: // implementation // -------------- - GdkWindow *m_window; + GdkWindow *m_gdkwindow; GdkGC *m_penGC; GdkGC *m_brushGC; GdkGC *m_textGC; GdkGC *m_bgGC; GdkColormap *m_cmap; bool m_isScreenDC; - wxWindow *m_owningWindow; wxRegion m_currentClippingRegion; wxRegion m_paintClippingRegion; @@ -134,66 +123,44 @@ public: void SetUpDC( bool ismem = false ); void Destroy(); - + virtual void ComputeScaleAndOrigin(); - virtual GdkWindow *GetGDKWindow() const { return m_window; } + virtual GdkWindow *GetGDKWindow() const { return m_gdkwindow; } private: - DECLARE_ABSTRACT_CLASS(wxGTKWindowImplDC) + void DrawingSetup(GdkGC*& gc, bool& originChanged); + GdkPixmap* MonoToColor(GdkPixmap* monoPixmap, int x, int y, int w, int h) const; + + DECLARE_ABSTRACT_CLASS(wxWindowDCImpl) }; //----------------------------------------------------------------------------- -// wxClientDC +// wxClientDCImpl //----------------------------------------------------------------------------- -#if wxUSE_NEW_DC -class WXDLLIMPEXP_CORE wxGTKClientImplDC : public wxGTKWindowImplDC -#else -#define wxGTKClientImplDC wxClientDC -class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC -#endif +class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl { public: + wxClientDCImpl( wxDC *owner ); + wxClientDCImpl( wxDC *owner, wxWindow *win ); -#if wxUSE_NEW_DC - wxGTKClientImplDC( wxDC *owner ); - wxGTKClientImplDC( wxDC *owner, wxWindow *win ); -#else - wxClientDC(); - wxClientDC( wxWindow *win ); -#endif - -protected: virtual void DoGetSize(int *width, int *height) const; -private: - DECLARE_ABSTRACT_CLASS(wxGTKClientImplDC) + DECLARE_ABSTRACT_CLASS(wxClientDCImpl) }; //----------------------------------------------------------------------------- -// wxPaintDC +// wxPaintDCImpl //----------------------------------------------------------------------------- -#if wxUSE_NEW_DC -class WXDLLIMPEXP_CORE wxGTKPaintImplDC : public wxGTKClientImplDC -#else -#define wxGTKPaintImplDC wxPaintDC -class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC -#endif +class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl { public: + wxPaintDCImpl( wxDC *owner ); + wxPaintDCImpl( wxDC *owner, wxWindow *win ); -#if wxUSE_NEW_DC - wxGTKPaintImplDC( wxDC *owner ); - wxGTKPaintImplDC( wxDC *owner, wxWindow *win ); -#else - wxPaintDC(); - wxPaintDC( wxWindow *win ); -#endif - -private: - DECLARE_ABSTRACT_CLASS(wxGTKPaintImplDC) + DECLARE_ABSTRACT_CLASS(wxPaintDCImpl) }; -#endif // __GTKDCCLIENTH__ +#endif // _WX_GTKDCCLIENT_H_