Sorry, should be a __UNIX__ test

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

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index 40434bd5f4c2c060940dfa06c519b5e5d438fcd6..c6fa2faf9d26bd26eb70664eb989dbe1cbd2ae49 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -12,32 +12,32 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#ifdef __GNUG__
-    #pragma interface "dcmemory.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "dcmemory.h"

 #endif
 
 #include "wx/dcclient.h"
 
 class wxMemoryDC : public wxWindowDC
 {
 #endif
 
 #include "wx/dcclient.h"
 
 class wxMemoryDC : public wxWindowDC
 {

-DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+        

 public:
     wxMemoryDC();
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     ~wxMemoryDC();
 public:
     wxMemoryDC();
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     ~wxMemoryDC();

-
+    

     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; }
     wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }

-
+    

 private:
 private:

-    friend wxPaintDC;
-
+    friend class wxPaintDC;
+    

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

-    // _WX_DCMEMORY_H_
+// _WX_DCMEMORY_H_