X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb7637b58750721cc1cbd7b126c3d9323a974b75..444f6eed4706a7c68d8fc8123eca283d2b983a09:/include/wx/gtk/dc.h

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index d19fbdc1d2..2e067abc95 100644
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -7,30 +7,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKDCH__
-#define __GTKDCH__
+#ifndef _WX_GTKDC_H_
+#define _WX_GTKDC_H_
 
+#include "wx/dc.h"
 
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 
-#if wxUSE_NEW_DC
-class WXDLLIMPEXP_CORE wxGTKImplDC : public wxImplDC
-#else
-#define wxGTKImplDC wxDC
-class WXDLLIMPEXP_CORE wxDC : public wxDCBase
-#endif
-
+class WXDLLIMPEXP_CORE wxGTKDCImpl : public wxDCImpl
 {
 public:
-#if wxUSE_NEW_DC
-    wxGTKImplDC( wxDC *owner );
-#else
-    wxDC();
-#endif
-
-    virtual ~wxGTKImplDC();
+    wxGTKDCImpl( wxDC *owner );
+    virtual ~wxGTKDCImpl();
 
 #if wxUSE_PALETTE
     void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
@@ -46,20 +36,18 @@ public:
 
     virtual GdkWindow* GetGDKWindow() const { return NULL; }
 
-protected:
     // base class pure virtuals implemented here
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSizeMM(int* width, int* height) const;
 
-private:
-    DECLARE_ABSTRACT_CLASS(wxGTKImplDC)
+    DECLARE_ABSTRACT_CLASS(wxGTKDCImpl)
 };
 
-// this must be defined when wxDC::Blit() honours the DC origian and needed to
+// this must be defined when wxDC::Blit() honours the DC origin and needed to
 // allow wxUniv code in univ/winuniv.cpp to work with versions of wxGTK
 // 2.3.[23]
 #ifndef wxHAS_WORKING_GTK_DC_BLIT
     #define wxHAS_WORKING_GTK_DC_BLIT
 #endif
 
-#endif // __GTKDCH__
+#endif // _WX_GTKDC_H_