added cw6 fixes and patrick's patches

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

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index 40434bd5f4c2c060940dfa06c519b5e5d438fcd6..bde81607ca0d3f4a33ff7491d3c2a1f59407d999 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -29,12 +29,12 @@ public:
 
     virtual void SelectObject( const wxBitmap& bitmap );
 
 
     virtual void SelectObject( const wxBitmap& bitmap );
 

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

 
     wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
 
 private:
 
     wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
 
 private:

-    friend wxPaintDC;
+    friend class wxPaintDC;

 
     wxBitmap  m_bitmap;
 };
 
     wxBitmap  m_bitmap;
 };