X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c75d8baf987c83e231c981d07b5a9217d711361..33f3e2b31ed781ba1446b49ec6d3e226c0a5c652:/include/wx/gtk/dcmemory.h diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h index d165b61768..576c5c53af 100644 --- a/include/wx/gtk/dcmemory.h +++ b/include/wx/gtk/dcmemory.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcmemory.h +// Name: wx/gtk/dcmemory.h // Purpose: // Author: Robert Roebling // RCS-ID: $Id$ @@ -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, public wxMemoryImplDCBase -#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,25 @@ public: 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; - - // overridden from wxMemoryImplDCBase + virtual void* GetHandle() const; + + // overridden for wxMemoryDC Impl virtual void DoSelect(const wxBitmap& bitmap); - virtual const wxBitmap& DoGetSelectedBitmap() const; - virtual wxBitmap& DoGetSelectedBitmap(); - wxBitmap m_selected; - + virtual const wxBitmap& GetSelectedBitmap() const; + virtual wxBitmap& GetSelectedBitmap(); + private: + wxBitmap m_selected; + void Init(); - DECLARE_ABSTRACT_CLASS(wxGTKMemoryImplDC) + DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl) }; -#endif // _WX_GTK_DCMEMORY_H_ +#endif + // _WX_GTK_DCMEMORY_H_ +