X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f37154e988c597e32a840e43783cf0b23e5f8b4..d0332cbc07d487c30d83515fb3351790565ec1de:/include/wx/gtk/dcmemory.h

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index b987d4609d..40e3ef2a2d 100644
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -10,33 +10,21 @@
 #ifndef _WX_GTK_DCMEMORY_H_
 #define _WX_GTK_DCMEMORY_H_
 
-#include "wx/dcclient.h"
+#include "wx/dcmemory.h"
+#include "wx/gtk/dcclient.h"
 
 //-----------------------------------------------------------------------------
-// wxMemoryDC
+// wxMemoryDCImpl
 //-----------------------------------------------------------------------------
 
-
-#if wxUSE_NEW_DC
-class WXDLLIMPEXP_CORE wxGTKMemoryImplDC : public wxGTKWindowImplDC
-#else
-#define wxGTKMemoryImplDC wxMemoryDC
-class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase
-#endif
+class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl
 {
 public:
+    wxMemoryDCImpl( wxMemoryDC *owner );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
 
-#if wxUSE_NEW_DC
-    wxGTKMemoryImplDC( wxMemoryDC *owner );
-    wxGTKMemoryImplDC( wxMemoryDC *owner, wxBitmap& bitmap );
-    wxGTKMemoryImplDC( wxMemoryDC *owner, wxDC *dc );
-#else
-    wxMemoryDC();
-    wxMemoryDC(wxBitmap& bitmap);
-    wxMemoryDC( wxDC *dc );
-#endif
-    
-    virtual ~wxGTKMemoryImplDC();
+    virtual ~wxMemoryDCImpl();
 
     // these get reimplemented for mono-bitmaps to behave
     // more like their Win32 couterparts. They now interpret
@@ -48,25 +36,24 @@ public:
     virtual void SetTextForeground( const wxColour &col );
     virtual void SetTextBackground( const wxColour &col );
 
-protected:
-    // overridden from wxImplDC
+    // overridden from wxDCImpl
     virtual void DoGetSize( int *width, int *height ) const;
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
 
     // overridden for wxMemoryDC Impl
     virtual void DoSelect(const wxBitmap& bitmap);
 
-public:
     virtual const wxBitmap& GetSelectedBitmap() const;
     virtual wxBitmap& GetSelectedBitmap();
 
 private:
     wxBitmap  m_selected;
-    
-private:
+
     void Init();
 
-    DECLARE_ABSTRACT_CLASS(wxGTKMemoryImplDC)
+    DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl)
 };
 
-#endif // _WX_GTK_DCMEMORY_H_
+#endif
+    // _WX_GTK_DCMEMORY_H_
+