support retina display

[wxWidgets.git] / include / wx / gtk / dcclient.h

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index 04d3e3b1ae0bb9460cf6b311815404249ce31625..4c96d69fc05c93c4ea7d3881adc8f414b679db5b 100644 (file)
--- 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$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -11,10 +11,6 @@
 #define _WX_GTKDCCLIENT_H_
 
 #include "wx/gtk/dc.h"
 #define _WX_GTKDCCLIENT_H_
 
 #include "wx/gtk/dc.h"

-#include "wx/dcclient.h"
-#include "wx/region.h"
-
-class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 //-----------------------------------------------------------------------------
 // wxWindowDCImpl
 
 //-----------------------------------------------------------------------------
 // wxWindowDCImpl


@@ -32,7 +28,8 @@ public:
     virtual bool CanGetTextExtent() const { return true; }
 
     virtual void DoGetSize(int *width, int *height) const;
     virtual bool CanGetTextExtent() const { return true; }
 
     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 );
     virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
 
     virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 );


@@ -43,11 +40,11 @@ public:
                                     double sa, double ea );
     virtual void DoDrawPoint( wxCoord x, wxCoord y );
 
                                     double sa, double ea );
     virtual void DoDrawPoint( wxCoord x, wxCoord y );
 

-    virtual void DoDrawLines(int n, wxPoint points[],
+    virtual void DoDrawLines(int n, const wxPoint points[],

                              wxCoord xoffset, wxCoord yoffset);
                              wxCoord xoffset, wxCoord yoffset);

-    virtual void DoDrawPolygon(int n, wxPoint points[],
+    virtual void DoDrawPolygon(int n, const wxPoint points[],

                                wxCoord xoffset, wxCoord yoffset,
                                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 );
 
     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 );


@@ -57,18 +54,21 @@ public:
     virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y,
                                bool useMask = false );
 
     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,
                          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,
 
     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 DoSetDeviceClippingRegion( const wxRegion &region );
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
     virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     virtual void DoSetDeviceClippingRegion( const wxRegion &region );


@@ -82,7 +82,7 @@ public:
     virtual void SetPen( const wxPen &pen );
     virtual void SetBrush( const wxBrush &brush );
     virtual void SetBackground( const wxBrush &brush );
     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 );
     virtual void SetTextForeground( const wxColour &col );
     virtual void SetTextBackground( const wxColour &col );
     virtual void SetBackgroundMode( int mode );


@@ -126,25 +126,7 @@ public:
 
 private:
     void DrawingSetup(GdkGC*& gc, bool& originChanged);
 
 private:
     void DrawingSetup(GdkGC*& gc, bool& originChanged);

-
-    // return true if the rectangle specified by the parameters is entirely
-    // outside of the current clipping region
-    bool IsOutsideOfClippingRegion(int x, int y, int w, int h);
-
-    // remove the current clipping mask and set the clipping region
-    void RemoveClipMask(GdkGC *gc);
-
-    // return the mask equal to the intersection of the original one with the
-    // clipping region
-    GdkBitmap *GetClippedMask(GdkBitmap *mask, int w, int h,
-                              int x, int y,
-                              int xsrcMask, int ysrcMask);
-
-    void DoDrawMonoBitmap(const wxBitmap& bitmap,
-                          int bmp_w, int bmp_h,
-                          int xsrc, int ysrc,
-                          int xdest, int ydest,
-                          int width, int height);
+    GdkPixmap* MonoToColor(GdkPixmap* monoPixmap, int x, int y, int w, int h) const;

 
     DECLARE_ABSTRACT_CLASS(wxWindowDCImpl)
 };
 
     DECLARE_ABSTRACT_CLASS(wxWindowDCImpl)
 };