Upported combobox changes and another fix.

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

diff --git a/include/wx/mac/dcmemory.h b/include/wx/mac/dcmemory.h
index c6c57376420c83bf866bdbd71898ab7f362a0421..21a5d3ba8ce1b964c77d3fc52ff357bd306bce21 100644 (file)
--- a/include/wx/mac/dcmemory.h
+++ b/include/wx/mac/dcmemory.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcmemory.h
 // Purpose:     wxMemoryDC class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dcmemory.h"
 #endif
 
@@ -27,10 +27,9 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     ~wxMemoryDC(void);
     virtual void SelectObject( const wxBitmap& bitmap );
-    void GetSize( int *width, int *height ) const;
-
-  private: 
-    friend wxPaintDC;
+    virtual void DoGetSize( int *width, int *height ) const;
+        wxBitmap    GetSelectedObject() { return m_selected ; }
+  private:
     wxBitmap  m_selected;
 };