Remove usused variable

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

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index d165b6176837f79d6e17d2eb90adba2221269a31..ff470015c82cedf04f4023ad7fd2d06901131946 100644 (file)
--- 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_
 
 #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, public wxMemoryImplDCBase
-#else
-#define wxGTKMemoryImplDC wxMemoryDC
-class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase
-#endif
+class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl

 {
 public:
 {
 public:

-
-#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
+    wxMemoryDCImpl( wxMemoryDC *owner );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );

     
     

-    virtual ~wxGTKMemoryImplDC();
+    virtual ~wxMemoryDCImpl();

 
     // these get reimplemented for mono-bitmaps to behave
     // more like their Win32 couterparts. They now interpret
 
     // 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 );
 
     virtual void SetTextForeground( const wxColour &col );
     virtual void SetTextBackground( const wxColour &col );
 

-    // implementation
-    wxBitmap GetSelectedBitmap() const { return m_selected; }
-
-protected:
-    // overridden from wxImplDC
+    // overridden from wxDCImpl

     virtual void DoGetSize( int *width, int *height ) const;
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
 
     virtual void DoGetSize( int *width, int *height ) const;
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
 

-    // overridden from wxMemoryImplDCBase
+    // overridden for wxMemoryDC Impl

     virtual void DoSelect(const wxBitmap& bitmap);
     virtual void DoSelect(const wxBitmap& bitmap);

-    virtual const wxBitmap& DoGetSelectedBitmap() const;
-    virtual wxBitmap& DoGetSelectedBitmap();

 
 

+    virtual const wxBitmap& GetSelectedBitmap() const;
+    virtual wxBitmap& GetSelectedBitmap();
+
+private:

     wxBitmap  m_selected;
     
     wxBitmap  m_selected;
     

-private:

     void Init();
 
     void Init();
 

-    DECLARE_ABSTRACT_CLASS(wxGTKMemoryImplDC)
+    DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl)

 };
 
 };
 

-#endif // _WX_GTK_DCMEMORY_H_
+#endif 
+    // _WX_GTK_DCMEMORY_H_
+