set eol-style

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

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index a8d6434ad39e65e083357b39d0ec0f2f7205bf18..a0fb9d6c23b428d246a2f8dda6939b595780ca24 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -7,29 +7,22 @@
 // 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
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase

 {
 public:
 {
 public:

-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
+    wxMemoryDC() : wxWindowDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) : wxWindowDC() { Init(); SelectObject(bitmap); }

     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC();
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC();

-    virtual void SelectObject( const wxBitmap& bitmap );

 
     // 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,17 +35,22 @@ public:
     virtual void SetTextBackground( const wxColour &col );
 
     // implementation
     virtual void SetTextBackground( const wxColour &col );
 
     // implementation

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

     wxBitmap  m_selected;
 
 protected:
     void DoGetSize( int *width, int *height ) const;
     wxBitmap  m_selected;
 
 protected:
     void DoGetSize( int *width, int *height ) const;

-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
-    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
+    virtual void DoSelect(const wxBitmap& bitmap);
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
+    {
+        wxBitmap bmp = GetSelectedBitmap();
+        return subrect ? bmp.GetSubBitmap(*subrect) : bmp;
+    }
+
+private:
+    void Init();

 
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 

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