Doc corrections; added HelpGen project files

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

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index 19c9e2e09440ac55f6c518dd320c356febc4937e..f91eae7dc9f51d18ee2102e76f8f8aec3db35629 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -31,8 +31,6 @@ class wxClientDC;
 
 class wxWindowDC : public wxDC
 {
-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-
 public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
@@ -42,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;
 
@@ -72,6 +71,8 @@ public:
                          int logical_func = wxCOPY, bool useMask = FALSE );
 
     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,
@@ -114,13 +115,23 @@ 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)
 };
 
 //-----------------------------------------------------------------------------
@@ -129,11 +140,12 @@ public:
 
 class wxPaintDC : public wxWindowDC
 {
-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
-
 public:
     wxPaintDC();
     wxPaintDC( wxWindow *win );
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPaintDC)
 };
 
 //-----------------------------------------------------------------------------
@@ -142,12 +154,12 @@ public:
 
 class wxClientDC : public wxWindowDC
 {
-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-
 public:
     wxClientDC();
     wxClientDC( wxWindow *win );
-};
 
+private:
+    DECLARE_DYNAMIC_CLASS(wxClientDC)
+};
 
 #endif // __GTKDCCLIENTH__