Fixes so joystick not only compiles on Linux, but it actually works too!

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

diff --git a/include/wx/x11/dcmemory.h b/include/wx/x11/dcmemory.h
index 5d85ded03e558c153c7e346192d835f449f865ce..50259bbdf645a834a20366d70f28e091593245b4 100644 (file)
--- a/include/wx/x11/dcmemory.h
+++ b/include/wx/x11/dcmemory.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "dcmemory.h"
 #endif
 
@@ -20,23 +20,18 @@
 
 class wxMemoryDC : public wxWindowDC
 {
-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-        
 public:
     wxMemoryDC();
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     ~wxMemoryDC();
-    
     virtual void SelectObject( const wxBitmap& bitmap );
-    
     void DoGetSize( int *width, int *height ) const;
-    
-    wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
-    
+
+    // implementation
+    wxBitmap  m_selected;
+
 private:
-    friend class wxPaintDC;
-    
-    wxBitmap  m_bitmap;
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 
 #endif