Small speed up to fonts and support for scaling.

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

diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h
index bfbce74123b2591303bb49520e0b9e46ff301cf2..f2a16a37fe633ac98800e70c036b44ce328294d1 100644 (file)
--- a/include/wx/x11/dcclient.h
+++ b/include/wx/x11/dcclient.h
@@ -46,7 +46,7 @@ public:
 
 protected:
     virtual void DoGetSize(int *width, int *height) 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 DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE );

     virtual bool DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const;
     
     virtual void DoDrawPoint(wxCoord x, wxCoord y);
     virtual bool DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const;
     
     virtual void DoDrawPoint(wxCoord x, wxCoord y);


@@ -114,6 +114,7 @@ public:
     virtual wxSize GetPPI() const;
     
     virtual void DestroyClippingRegion();
     virtual wxSize GetPPI() const;
     
     virtual void DestroyClippingRegion();

+    WXWindow GetWindow() const { return m_window; }

 
 protected:    
     // implementation
 
 protected:    
     // implementation


@@ -132,6 +133,11 @@ protected:
     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;
 
     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;
 

+#if wxUSE_UNICODE
+    PangoContext *m_context;
+    PangoFontDescription *m_fontdesc;
+#endif
+

     void SetUpDC();
     void Destroy();
     void ComputeScaleAndOrigin();
     void SetUpDC();
     void Destroy();
     void ComputeScaleAndOrigin();