replace changes of r49890 by defining more compatibility operators in wxCmdLineArgsAr...

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

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index e950326b954e34f11b5e0b5cb95d59c45e290afd..d165b6176837f79d6e17d2eb90adba2221269a31 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -7,29 +7,36 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKDCMEMORYH__
-#define __GTKDCMEMORYH__
+#ifndef _WX_GTK_DCMEMORY_H_
+#define _WX_GTK_DCMEMORY_H_

 
 

-#include "wx/defs.h"

 #include "wx/dcclient.h"
 
 #include "wx/dcclient.h"
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMemoryDC;
-

 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
+
+#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

 {
 public:
 {
 public:

+
+#if wxUSE_NEW_DC
+    wxGTKMemoryImplDC( wxMemoryDC *owner );
+    wxGTKMemoryImplDC( wxMemoryDC *owner, wxBitmap& bitmap );
+    wxGTKMemoryImplDC( wxMemoryDC *owner, wxDC *dc );
+#else

     wxMemoryDC();
     wxMemoryDC();

-    wxMemoryDC( wxDC *dc ); // Create compatible DC
-    ~wxMemoryDC();
-    virtual void SelectObject( const wxBitmap& bitmap );
+    wxMemoryDC(wxBitmap& bitmap);
+    wxMemoryDC( wxDC *dc );
+#endif
+    
+    virtual ~wxGTKMemoryImplDC();

 
     // 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


@@ -42,14 +49,24 @@ public:
     virtual void SetTextBackground( const wxColour &col );
 
     // implementation
     virtual void SetTextBackground( const wxColour &col );
 
     // implementation

-    wxBitmap  m_selected;
+    wxBitmap GetSelectedBitmap() const { return m_selected; }

 
 protected:
 
 protected:

-    void DoGetSize( int *width, int *height ) const;
+    // overridden from wxImplDC
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;

 
 

-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-};
+    // overridden from wxMemoryImplDCBase
+    virtual void DoSelect(const wxBitmap& bitmap);
+    virtual const wxBitmap& DoGetSelectedBitmap() const;
+    virtual wxBitmap& DoGetSelectedBitmap();

 
 

-#endif
-    // __GTKDCMEMORYH__
+    wxBitmap  m_selected;
+    
+private:
+    void Init();
+
+    DECLARE_ABSTRACT_CLASS(wxGTKMemoryImplDC)
+};

 
 

+#endif // _WX_GTK_DCMEMORY_H_