Small fix

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

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index de91b5c126025c948a3090d16945e7586bca3755..369deee2fddc4322581e3f5aa41311777461c3c5 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -13,19 +13,24 @@
 #include "wx/dc.h"
 #include "wx/region.h"
 
 #include "wx/dc.h"
 #include "wx/region.h"
 

-class WXDLLIMPEXP_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 //-----------------------------------------------------------------------------
 // wxWindowDC
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxWindowDC
 //-----------------------------------------------------------------------------
 

+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKWindowImplDC : public wxGTKImplDC
+#else
+#define wxGTKWindowImplDC wxWindowDC

 class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
 class WXDLLIMPEXP_CORE wxWindowDC : public wxDC

+#endif

 {
 public:
 {
 public:

-    wxWindowDC();
-    wxWindowDC( wxWindow *win );
+    wxGTKWindowImplDC();
+    wxGTKWindowImplDC( wxWindow *win );

 
 

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

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


@@ -68,7 +73,7 @@ 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 );
     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 );


@@ -129,38 +134,48 @@ public:
     virtual GdkWindow *GetGDKWindow() const { return m_window; }
 
 private:
     virtual GdkWindow *GetGDKWindow() const { return m_window; }
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
+    DECLARE_DYNAMIC_CLASS(wxGTKWindowImplDC)

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

+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKClientImplDC : public wxGTKWindowImplDC
+#else
+#define wxGTKClientImplDC wxClientDC

 class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC
 class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC

+#endif

 {
 public:
 {
 public:

-    wxClientDC() { }
-    wxClientDC( wxWindow *win );
+    wxGTKClientImplDC() { }
+    wxGTKClientImplDC( wxWindow *win );

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

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
+    DECLARE_DYNAMIC_CLASS(wxGTKClientImplDC)

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

+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKPaintImplDC : public wxGTKClientImplDC
+#else
+#define wxGTKPaintImplDC wxPaintDC

 class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC
 class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC

+#endif

 {
 public:
 {
 public:

-    wxPaintDC() { }
-    wxPaintDC( wxWindow *win );
+    wxGTKPaintImplDC() { }
+    wxGTKPaintImplDC( wxWindow *win );

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+    DECLARE_DYNAMIC_CLASS(wxGTKPaintImplDC)

 };
 
 #endif // __GTKDCCLIENTH__
 };
 
 #endif // __GTKDCCLIENTH__