fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index 632afa38eccb19feb2e44a1cc54c495a71c92a00..e950326b954e34f11b5e0b5cb95d59c45e290afd 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -4,17 +4,12 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKDCMEMORYH__
 #define __GTKDCMEMORYH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 #include "wx/dcclient.h"
 
@@ -22,26 +17,37 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxMemoryDC;
+class WXDLLIMPEXP_CORE wxMemoryDC;
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
-class wxMemoryDC: public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
 {
-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
 public:
-  wxMemoryDC(void);
-  wxMemoryDC( wxDC *dc ); // Create compatible DC
-  ~wxMemoryDC(void);
-  virtual void SelectObject( const wxBitmap& bitmap );
-  void GetSize( int *width, int *height ) const;
-
-  // implementation      
-    
-  wxBitmap  m_selected;
+    wxMemoryDC();
+    wxMemoryDC( wxDC *dc ); // Create compatible DC
+    ~wxMemoryDC();
+    virtual void SelectObject( const wxBitmap& bitmap );
+
+    // these get reimplemented for mono-bitmaps to behave
+    // more like their Win32 couterparts. They now interpret
+    // wxWHITE, wxWHITE_BRUSH and wxWHITE_PEN as drawing 0
+    // 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;
+
+protected:
+    void DoGetSize( int *width, int *height ) const;
+
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 
 #endif