Some additions to the 12-bit patch.

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

diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index 4c7e2ff70887fd736f41c6e2b2ef6f619eaa7698..77331532da0b56aed7aef283c1bc059fe882a986 100644 (file)
--- a/include/wx/gtk1/dcclient.h
+++ b/include/wx/gtk1/dcclient.h
@@ -31,54 +31,58 @@ class wxClientDC;
 
 class wxWindowDC : public wxDC
 {
-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-
 public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 
-    ~wxWindowDC();
+    virtual ~wxWindowDC();
 
     virtual bool CanDrawBitmap() const { return TRUE; }
     virtual bool CanGetTextExtent() const { return TRUE; }
 
-    virtual void DoFloodFill( long x, long y, const wxColour& col, int style=wxFLOOD_SURFACE );
-    virtual bool DoGetPixel( long x1, long y1, wxColour *col ) const;
+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 DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
 
-    virtual void DoDrawLine( long x1, long y1, long x2, long y2 );
-    virtual void DoCrossHair( long x, long y );
-    virtual void DoDrawArc( long x1, long y1, long x2, long y2,
-                            long xc, long yc );
-    virtual void DoDrawEllipticArc( long x, long y, long width, long height,
+    virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 );
+    virtual void DoCrossHair( wxCoord x, wxCoord y );
+    virtual void DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
+                            wxCoord xc, wxCoord yc );
+    virtual void DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height,
                                     double sa, double ea );
-    virtual void DoDrawPoint( long x, long y );
+    virtual void DoDrawPoint( wxCoord x, wxCoord y );
 
     virtual void DoDrawLines(int n, wxPoint points[],
-                             long xoffset, long yoffset);
+                             wxCoord xoffset, wxCoord yoffset);
     virtual void DoDrawPolygon(int n, wxPoint points[],
-                               long xoffset, long yoffset,
+                               wxCoord xoffset, wxCoord yoffset,
                                int fillStyle = wxODDEVEN_RULE);
 
-    virtual void DoDrawRectangle( long x, long y, long width, long height );
-    virtual void DoDrawRoundedRectangle( long x, long y, long width, long height, double radius = 20.0 );
-    virtual void DoDrawEllipse( long x, long y, long width, long height );
+    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 DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
 
-    virtual void DoDrawIcon( const wxIcon &icon, long x, long y );
-    virtual void DoDrawBitmap( const wxBitmap &bitmap, long x, long y,
+    virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y );
+    virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y,
                                bool useMask = FALSE );
 
-    virtual bool DoBlit( long xdest, long ydest, long width, long height,
-                         wxDC *source, long xsrc, long ysrc,
-                         int logical_func = wxCOPY, bool useMask = FALSE );
-
-    virtual void DoDrawText( const wxString &text, long x, long y );
-    virtual void GetTextExtent( const wxString &string,
-                                long *width, long *height,
-                                long *descent = (long *) NULL,
-                                long *externalLeading = (long *) NULL,
+    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 );
+
+    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,
                                 wxFont *theFont = (wxFont *) NULL) const;
-    virtual long GetCharWidth() const;
-    virtual long GetCharHeight() const;
+
+public:
+    virtual wxCoord GetCharWidth() const;
+    virtual wxCoord GetCharHeight() const;
 
     virtual void Clear();
 
@@ -92,12 +96,10 @@ public:
     virtual void SetBackgroundMode( int mode );
     virtual void SetPalette( const wxPalette& palette );
 
-    virtual void DoSetClippingRegion( long x, long y, long width, long height );
+    virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     virtual void DestroyClippingRegion();
     virtual void DoSetClippingRegionAsRegion( const wxRegion &region  );
 
-    virtual void DoDrawSpline( wxList *points );
-
     // Resolution in pixels per logical inch
     virtual wxSize GetPPI() const;
     virtual int GetDepth() const;
@@ -112,38 +114,54 @@ public:
     GdkGC        *m_bgGC;
     GdkColormap  *m_cmap;
     bool          m_isMemDC;
+    bool          m_isScreenDC;
     wxWindow     *m_owner;
+    wxRegion      m_currentClippingRegion;
+    wxRegion      m_paintClippingRegion;
+#ifdef __WXGTK20__
+    PangoContext *m_context;
+    PangoFontDescription *m_fontdesc;
+#endif
 
     void SetUpDC();
     void Destroy();
+    void ComputeScaleAndOrigin();
+
     GdkWindow *GetWindow() { return m_window; }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxWindowDC)
 };
 
 //-----------------------------------------------------------------------------
-// wxPaintDC
+// wxClientDC
 //-----------------------------------------------------------------------------
 
-class wxPaintDC : public wxWindowDC
+class wxClientDC : public wxWindowDC
 {
-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
-
 public:
-    wxPaintDC();
-    wxPaintDC( wxWindow *win );
+    wxClientDC() { }
+    wxClientDC( wxWindow *win );
+
+protected:
+    virtual void DoGetSize(int *width, int *height) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxClientDC)
 };
 
 //-----------------------------------------------------------------------------
-// wxClientDC
+// wxPaintDC
 //-----------------------------------------------------------------------------
 
-class wxClientDC : public wxWindowDC
+class wxPaintDC : public wxClientDC
 {
-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-
 public:
-    wxClientDC();
-    wxClientDC( wxWindow *win );
-};
+    wxPaintDC() { }
+    wxPaintDC( wxWindow *win );
 
+private:
+    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+};
 
 #endif // __GTKDCCLIENTH__