1. removed 'B' flag from treebase.cpp and regenerated the makefiles

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

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index 0142e694c7297c2b1721a93b138b6660b6eb4fa1..f91eae7dc9f51d18ee2102e76f8f8aec3db35629 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -40,6 +40,7 @@ public:
     virtual bool CanDrawBitmap() const { return TRUE; }
     virtual bool CanGetTextExtent() const { return TRUE; }
 
+//protected:
     virtual void DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE );
     virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
 
@@ -114,14 +115,21 @@ public:
     GdkGC        *m_bgGC;
     GdkColormap  *m_cmap;
     bool          m_isMemDC;
+    bool          m_isScreenDC;
     wxWindow     *m_owner;
+    wxRegion      m_currentClippingRegion;
+    wxRegion      m_paintClippingRegion;
+#ifdef __WXGTK20__
+    PangoContext *m_context;
+    PangoFontDescription *m_fontdesc;
+#endif
 
     void SetUpDC();
     void Destroy();
     void ComputeScaleAndOrigin();
 
     GdkWindow *GetWindow() { return m_window; }
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowDC)
 };
@@ -135,7 +143,7 @@ class wxPaintDC : public wxWindowDC
 public:
     wxPaintDC();
     wxPaintDC( wxWindow *win );
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxPaintDC)
 };
@@ -149,7 +157,7 @@ class wxClientDC : public wxWindowDC
 public:
     wxClientDC();
     wxClientDC( wxWindow *win );
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxClientDC)
 };