Added wxWindow::DoMoveWindow(..)

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

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index e9b2a518da102ee52ac14666c1ce6675103a12ab..0142e694c7297c2b1721a93b138b6660b6eb4fa1 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -31,8 +31,6 @@ class wxClientDC;
 
 class wxWindowDC : public wxDC
 {
 
 class wxWindowDC : public wxDC
 {

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-

 public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );


@@ -42,43 +40,45 @@ public:
     virtual bool CanDrawBitmap() const { return TRUE; }
     virtual bool CanGetTextExtent() const { return TRUE; }
 
     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;
+    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 );
                                     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[],
 
     virtual void DoDrawLines(int n, wxPoint points[],

-                             long xoffset, long yoffset);
+                             wxCoord xoffset, wxCoord yoffset);

     virtual void DoDrawPolygon(int n, wxPoint points[],
     virtual void DoDrawPolygon(int n, wxPoint points[],

-                               long xoffset, long yoffset,
+                               wxCoord xoffset, wxCoord yoffset,

                                int fillStyle = wxODDEVEN_RULE);
 
                                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 );
 
                                bool useMask = FALSE );
 

-    virtual bool DoBlit( long xdest, long ydest, long width, long height,
-                         wxDC *source, long xsrc, long ysrc,
+    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 );
 

-    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 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;
                                 wxFont *theFont = (wxFont *) NULL) const;

-    virtual long GetCharWidth() const;
-    virtual long GetCharHeight() const;
+    virtual wxCoord GetCharWidth() const;
+    virtual wxCoord GetCharHeight() const;

 
     virtual void Clear();
 
 
     virtual void Clear();
 


@@ -92,7 +92,7 @@ public:
     virtual void SetBackgroundMode( int mode );
     virtual void SetPalette( const wxPalette& palette );
 
     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 DestroyClippingRegion();
     virtual void DoSetClippingRegionAsRegion( const wxRegion &region  );
 


@@ -118,7 +118,12 @@ public:
 
     void SetUpDC();
     void Destroy();
 
     void SetUpDC();
     void Destroy();

+    void ComputeScaleAndOrigin();
+

     GdkWindow *GetWindow() { return m_window; }
     GdkWindow *GetWindow() { return m_window; }

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxWindowDC)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -127,11 +132,12 @@ public:
 
 class wxPaintDC : public wxWindowDC
 {
 
 class wxPaintDC : public wxWindowDC
 {

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
-

 public:
     wxPaintDC();
     wxPaintDC( wxWindow *win );
 public:
     wxPaintDC();
     wxPaintDC( wxWindow *win );

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxPaintDC)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -140,12 +146,12 @@ public:
 
 class wxClientDC : public wxWindowDC
 {
 
 class wxClientDC : public wxWindowDC
 {

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-

 public:
     wxClientDC();
     wxClientDC( wxWindow *win );
 public:
     wxClientDC();
     wxClientDC( wxWindow *win );

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxClientDC)

 };
 
 };
 

-

 #endif // __GTKDCCLIENTH__
 #endif // __GTKDCCLIENTH__