Override CocoaSetEnabled because it's not an NSControl

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

diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h
index 0b35e74731a28861a7554278e9c6cbfa11571d59..af67b3ddf2ee02448b97bc659c4262ccd2c1ff69 100644 (file)
--- a/include/wx/x11/dcclient.h
+++ b/include/wx/x11/dcclient.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 

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

 #pragma interface "dcclient.h"
 #endif
 
 #pragma interface "dcclient.h"
 #endif
 


@@ -46,7 +46,7 @@ public:
 
 protected:
     virtual void DoGetSize(int *width, int *height) const;
 
 protected:
     virtual void DoGetSize(int *width, int *height) const;

-    virtual void DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE );
+    virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE );

     virtual bool DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const;
     
     virtual void DoDrawPoint(wxCoord x, wxCoord y);
     virtual bool DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const;
     
     virtual void DoDrawPoint(wxCoord x, wxCoord y);


@@ -133,6 +133,11 @@ protected:
     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;
 
     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;
 

+#if wxUSE_UNICODE
+    PangoContext *m_context;
+    PangoFontDescription *m_fontdesc;
+#endif
+

     void SetUpDC();
     void Destroy();
     void ComputeScaleAndOrigin();
     void SetUpDC();
     void Destroy();
     void ComputeScaleAndOrigin();