Ryan's cumulative wxActiveX and media control patch (1427775)

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

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index 6edc56692556a04eae939b7c7e4eeaab6afb0dfd..ee0cf492ae1dc673eb6b9206f4215cc683c23272 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -6,35 +6,34 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#ifdef __GNUG__
-#pragma interface "dcmemory.h"
-#endif
-

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

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
-  public:
-    wxMemoryDC(void);
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+        
+public:
+    wxMemoryDC();

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

-    ~wxMemoryDC(void);
+    ~wxMemoryDC();
+    

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

-    void GetSize( int *width, int *height ) const;
-
-    inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
-
-  private: 
-    friend wxPaintDC;
+    
+    void DoGetSize( int *width, int *height ) const;
+    
+    wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
+    
+private:
+    friend class wxPaintDC;
+    

     wxBitmap  m_bitmap;
 };
 
 #endif
     wxBitmap  m_bitmap;
 };
 
 #endif

-    // _WX_DCMEMORY_H_
+// _WX_DCMEMORY_H_