Reapply wxWeakRef patch again

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

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index 802e60b69331a2b4a4002045c54bcd0dc4e74837..29e35429a5382665f43cd3d9a32f68a9008bc71f 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -7,40 +7,30 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKDCCLIENTH__
-#define __GTKDCCLIENTH__
+#ifndef _WX_GTKDCCLIENT_H_
+#define _WX_GTKDCCLIENT_H_

 
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
+#include "wx/gtk/dc.h"
+#include "wx/dcclient.h"
+#include "wx/region.h"

 
 

-#include "wx/dc.h"
-#include "wx/window.h"
+class WXDLLIMPEXP_FWD_CORE wxWindow;

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

-// classes
+// wxWindowDCImpl

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

-class wxWindowDC;
-class wxPaintDC;
-class wxClientDC;
-
-//-----------------------------------------------------------------------------
-// wxWindowDC
-//-----------------------------------------------------------------------------
-
-class wxWindowDC : public wxDC
+class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxGTKDCImpl

 {
 public:
 {
 public:

-    wxWindowDC();
-    wxWindowDC( wxWindow *win );
+    wxWindowDCImpl( wxDC *owner );
+    wxWindowDCImpl( wxDC *owner, wxWindow *win );

 
 

-    virtual ~wxWindowDC();
+    virtual ~wxWindowDCImpl();

 
 

-    virtual bool CanDrawBitmap() const { return TRUE; }
-    virtual bool CanGetTextExtent() const { return TRUE; }
+    virtual bool CanDrawBitmap() const { return true; }
+    virtual bool CanGetTextExtent() const { return true; }

 
 

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


@@ -65,11 +55,11 @@ protected:
 
     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, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 );
+                         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,
 
     virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );
     virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,


@@ -78,9 +68,11 @@ protected:
                                 wxCoord *width, wxCoord *height,
                                 wxCoord *descent = (wxCoord *) NULL,
                                 wxCoord *externalLeading = (wxCoord *) NULL,
                                 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;
 


@@ -96,72 +88,74 @@ 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  );

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

-    GdkWindow    *m_window;
+    GdkWindow    *m_gdkwindow;

     GdkGC        *m_penGC;
     GdkGC        *m_brushGC;
     GdkGC        *m_textGC;
     GdkGC        *m_bgGC;
     GdkColormap  *m_cmap;
     GdkGC        *m_penGC;
     GdkGC        *m_brushGC;
     GdkGC        *m_textGC;
     GdkGC        *m_bgGC;
     GdkColormap  *m_cmap;

-    bool          m_isMemDC;

     bool          m_isScreenDC;
     bool          m_isScreenDC;

-    wxWindow     *m_owner;

     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;
     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;

-#ifdef __WXGTK20__
+
+    // PangoContext stuff for GTK 2.0

     PangoContext *m_context;
     PangoContext *m_context;

+    PangoLayout *m_layout;

     PangoFontDescription *m_fontdesc;
     PangoFontDescription *m_fontdesc;

-#endif

 
 

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

     void Destroy();
     void Destroy();

-    void ComputeScaleAndOrigin();
+    
+    virtual void ComputeScaleAndOrigin();

 
 

-    GdkWindow *GetWindow() { return m_window; }
+    virtual GdkWindow *GetGDKWindow() const { return m_gdkwindow; }

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
+    void DrawingSetup(GdkGC*& gc, bool& originChanged);
+
+    DECLARE_ABSTRACT_CLASS(wxWindowDCImpl)

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

-// wxClientDC
+// wxClientDCImpl

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

-class wxClientDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl

 {
 public:
 {
 public:

-    wxClientDC() { }
-    wxClientDC( wxWindow *win );
+    wxClientDCImpl( wxDC *owner );
+    wxClientDCImpl( wxDC *owner, wxWindow *win );

 
 

-protected:

     virtual void DoGetSize(int *width, int *height) const;
 
     virtual void DoGetSize(int *width, int *height) const;
 

-private:
-    DECLARE_DYNAMIC_CLASS(wxClientDC)
+    DECLARE_ABSTRACT_CLASS(wxClientDCImpl)

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

-// wxPaintDC
+// wxPaintDCImpl

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

-class wxPaintDC : public wxClientDC
+class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl

 {
 public:
 {
 public:

-    wxPaintDC() { }
-    wxPaintDC( wxWindow *win );
+    wxPaintDCImpl( wxDC *owner );
+    wxPaintDCImpl( wxDC *owner, wxWindow *win );

 
 

-private:
-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+    DECLARE_ABSTRACT_CLASS(wxPaintDCImpl)

 };
 
 };
 

-#endif // __GTKDCCLIENTH__
+#endif // _WX_GTKDCCLIENT_H_