Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index eefcadab270bfa0e41594628f0cbaca5a5e0feba..576c5c53afa65f979ea9c94b40d7579fd074133a 100644 (file)
--- 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$
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -23,7 +23,7 @@ public:
     wxMemoryDCImpl( wxMemoryDC *owner );
     wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
     wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
     wxMemoryDCImpl( wxMemoryDC *owner );
     wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
     wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );

-    
+

     virtual ~wxMemoryDCImpl();
 
     // these get reimplemented for mono-bitmaps to behave
     virtual ~wxMemoryDCImpl();
 
     // these get reimplemented for mono-bitmaps to behave


@@ -36,27 +36,25 @@ 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 );
 

-protected:

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

-
+    virtual void* GetHandle() const;
+    

     // overridden for wxMemoryDC Impl
     virtual void DoSelect(const wxBitmap& bitmap);
 
     // overridden for wxMemoryDC Impl
     virtual void DoSelect(const wxBitmap& bitmap);
 

-public:

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

-    
-private:
+

     void Init();
 
     DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl)
 };
 
     void Init();
 
     DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl)
 };
 

-#endif 
+#endif

     // _WX_GTK_DCMEMORY_H_
 
     // _WX_GTK_DCMEMORY_H_