Border corrections

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

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index 4cc62a0e4c00dfd18622ccf5b90535356a9f704d..065e32a235280e104f1ebbfcdbb707e3475a6a27 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -11,27 +11,33 @@
 #define __GTKDCCLIENTH__
 
 #include "wx/dc.h"
-#include "wx/window.h"
+#include "wx/region.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindowDC;
-class WXDLLIMPEXP_CORE wxPaintDC;
-class WXDLLIMPEXP_CORE wxClientDC;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 //-----------------------------------------------------------------------------
 // wxWindowDC
 //-----------------------------------------------------------------------------
 
+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKWindowImplDC : public wxGTKImplDC
+#else
+#define wxGTKWindowImplDC wxWindowDC
 class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
+#endif
 {
 public:
+
+
+#if wxUSE_NEW_DC
+    wxGTKWindowImplDC( wxDC *owner );
+    wxGTKWindowImplDC( wxDC *owner, wxWindow *win );
+#else
     wxWindowDC();
     wxWindowDC( wxWindow *win );
+#endif
 
-    virtual ~wxWindowDC();
+    virtual ~wxGTKWindowImplDC();
 
     virtual bool CanDrawBitmap() const { return true; }
     virtual bool CanGetTextExtent() const { return true; }
@@ -74,7 +80,11 @@ protected:
                                 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;
@@ -92,14 +102,17 @@ public:
     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 DoSetClippingRegionAsRegion( const wxRegion &region  );
 
     // 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
     // --------------
 
@@ -109,58 +122,78 @@ public:
     GdkGC        *m_textGC;
     GdkGC        *m_bgGC;
     GdkColormap  *m_cmap;
-    bool          m_isMemDC;
     bool          m_isScreenDC;
-    wxWindow     *m_owner;
+    wxWindow     *m_owningWindow;
     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;
 
     // PangoContext stuff for GTK 2.0
-#ifdef __WXGTK20__
     PangoContext *m_context;
     PangoLayout *m_layout;
     PangoFontDescription *m_fontdesc;
-#endif
 
-    void SetUpDC();
+    void SetUpDC( bool ismem = false );
     void Destroy();
+    
     virtual void ComputeScaleAndOrigin();
 
-    GdkWindow *GetWindow() { return m_window; }
+    virtual GdkWindow *GetGDKWindow() const { return m_window; }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
+    DECLARE_ABSTRACT_CLASS(wxGTKWindowImplDC)
 };
 
 //-----------------------------------------------------------------------------
 // wxClientDC
 //-----------------------------------------------------------------------------
 
+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKClientImplDC : public wxGTKWindowImplDC
+#else
+#define wxGTKClientImplDC wxClientDC
 class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC
+#endif
 {
 public:
-    wxClientDC() { }
+
+#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_DYNAMIC_CLASS(wxClientDC)
+    DECLARE_ABSTRACT_CLASS(wxGTKClientImplDC)
 };
 
 //-----------------------------------------------------------------------------
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKPaintImplDC : public wxGTKClientImplDC
+#else
+#define wxGTKPaintImplDC wxPaintDC
 class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC
+#endif
 {
 public:
-    wxPaintDC() { }
+
+#if wxUSE_NEW_DC
+    wxGTKPaintImplDC( wxDC *owner );
+    wxGTKPaintImplDC( wxDC *owner, wxWindow *win );
+#else
+    wxPaintDC();
     wxPaintDC( wxWindow *win );
+#endif
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+    DECLARE_ABSTRACT_CLASS(wxGTKPaintImplDC)
 };
 
 #endif // __GTKDCCLIENTH__