added NO_PTR versions of ARRAY macros to suppress warnings (based on patch 770983)

[wxWidgets.git] / include / wx / gtk / dcclient.h

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index ab21e69e4a21c50e1ad9a7a780baf9101ae09f73..c2a6fa43c8f6c5d59561b20b978788a885f27753 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -10,7 +10,7 @@
 #ifndef __GTKDCCLIENTH__
 #define __GTKDCCLIENTH__
 
 #ifndef __GTKDCCLIENTH__
 #define __GTKDCCLIENTH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -118,8 +118,11 @@ public:
     wxWindow     *m_owner;
     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;
     wxWindow     *m_owner;
     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;

+    
+    // PangoContext stuff for GTK 2.0

 #ifdef __WXGTK20__
     PangoContext *m_context;
 #ifdef __WXGTK20__
     PangoContext *m_context;

+    PangoLayout *m_layout;

     PangoFontDescription *m_fontdesc;
 #endif
 
     PangoFontDescription *m_fontdesc;
 #endif