Border corrections

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

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index 19c9e2e09440ac55f6c518dd320c356febc4937e..065e32a235280e104f1ebbfcdbb707e3475a6a27 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -10,39 +10,41 @@
 #ifndef __GTKDCCLIENTH__
 #define __GTKDCCLIENTH__
 
 #ifndef __GTKDCCLIENTH__
 #define __GTKDCCLIENTH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/dc.h"
 #include "wx/dc.h"

-#include "wx/window.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+#include "wx/region.h"

 
 

-class wxWindowDC;
-class wxPaintDC;
-class wxClientDC;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 //-----------------------------------------------------------------------------
 // wxWindowDC
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // 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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-

 public:
 public:

+
+
+#if wxUSE_NEW_DC
+    wxGTKWindowImplDC( wxDC *owner );
+    wxGTKWindowImplDC( wxDC *owner, wxWindow *win );
+#else

     wxWindowDC();
     wxWindowDC( wxWindow *win );
     wxWindowDC();
     wxWindowDC( wxWindow *win );

+#endif

 
 

-    ~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; }

 
 

-    virtual void DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE );
+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 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 );


@@ -65,18 +67,26 @@ public:
 
     virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y );
     virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord 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( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                          wxDC *source, wxCoord xsrc, wxCoord 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, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 );

 
     virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );
 
     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,
     virtual void DoGetTextExtent( const wxString &string,
                                 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 &region );
+
+
+public:

     virtual wxCoord GetCharWidth() const;
     virtual wxCoord GetCharHeight() const;
 
     virtual wxCoord GetCharWidth() const;
     virtual wxCoord GetCharHeight() const;
 


@@ -92,18 +102,17 @@ 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( wxCoord x, wxCoord y, wxCoord width, wxCoord height );

     virtual void DestroyClippingRegion();
     virtual void DestroyClippingRegion();

-    virtual void DoSetClippingRegionAsRegion( const wxRegion &region  );
-
-#if wxUSE_SPLINES
-    virtual void DoDrawSpline( wxList *points );
-#endif

 
     // Resolution in pixels per logical inch
     virtual wxSize GetPPI() const;
     virtual int GetDepth() const;
 
 
     // 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
     // --------------
 
     // implementation
     // --------------
 


@@ -113,41 +122,78 @@ public:
     GdkGC        *m_textGC;
     GdkGC        *m_bgGC;
     GdkColormap  *m_cmap;
     GdkGC        *m_textGC;
     GdkGC        *m_bgGC;
     GdkColormap  *m_cmap;

-    bool          m_isMemDC;
-    wxWindow     *m_owner;
+    bool          m_isScreenDC;
+    wxWindow     *m_owningWindow;
+    wxRegion      m_currentClippingRegion;
+    wxRegion      m_paintClippingRegion;
+
+    // PangoContext stuff for GTK 2.0
+    PangoContext *m_context;
+    PangoLayout *m_layout;
+    PangoFontDescription *m_fontdesc;

 
 

-    void SetUpDC();
+    void SetUpDC( bool ismem = false );

     void Destroy();
     void Destroy();

-    void ComputeScaleAndOrigin();
+    
+    virtual void ComputeScaleAndOrigin();
+
+    virtual GdkWindow *GetGDKWindow() const { return m_window; }

 
 

-    GdkWindow *GetWindow() { return m_window; }
+private:
+    DECLARE_ABSTRACT_CLASS(wxGTKWindowImplDC)

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

-// wxPaintDC
+// wxClientDC

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxPaintDC : public wxWindowDC
+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKClientImplDC : public wxGTKWindowImplDC
+#else
+#define wxGTKClientImplDC wxClientDC
+class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC
+#endif

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
-

 public:
 public:

-    wxPaintDC();
-    wxPaintDC( 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)

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

-// wxClientDC
+// wxPaintDC

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxClientDC : public wxWindowDC
+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKPaintImplDC : public wxGTKClientImplDC
+#else
+#define wxGTKPaintImplDC wxPaintDC
+class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC
+#endif

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-

 public:
 public:

-    wxClientDC();
-    wxClientDC( 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)
+};

 
 #endif // __GTKDCCLIENTH__
 
 #endif // __GTKDCCLIENTH__