Applied patch which allows you to detach a stream

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

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index 12f106dac6a6adc82d8e05c05c67c815e8d7c998..b6b80af1addd8992e688aaadde7cc69efd813ad6 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKDCMEMORYH__
 #define __GTKDCMEMORYH__
 
 #ifndef __GTKDCMEMORYH__
 #define __GTKDCMEMORYH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

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


@@ -22,20 +17,19 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxMemoryDC;
+class WXDLLIMPEXP_CORE wxMemoryDC;

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

-class wxMemoryDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC

 {
 public:
     wxMemoryDC();
     wxMemoryDC( wxDC *dc ); // Create compatible DC
 {
 public:
     wxMemoryDC();
     wxMemoryDC( wxDC *dc ); // Create compatible DC

-    ~wxMemoryDC();
+    virtual ~wxMemoryDC();

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

-    void DoGetSize( int *width, int *height ) const;

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


@@ -43,13 +37,16 @@ public:
     // and everything else as drawing 1.
     virtual void SetPen( const wxPen &pen );
     virtual void SetBrush( const wxBrush &brush );
     // and everything else as drawing 1.
     virtual void SetPen( const wxPen &pen );
     virtual void SetBrush( const wxBrush &brush );

+    virtual void SetBackground( const wxBrush &brush );

     virtual void SetTextForeground( const wxColour &col );
     virtual void SetTextBackground( const wxColour &col );
 
     // implementation
     wxBitmap  m_selected;
 
     virtual void SetTextForeground( const wxColour &col );
     virtual void SetTextBackground( const wxColour &col );
 
     // implementation
     wxBitmap  m_selected;
 

-private:
+protected:
+    void DoGetSize( int *width, int *height ) const;
+

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