avoid warning for duplicate defined wxEntry when compiling with the Apple

[wxWidgets.git] / include / wx / mac / window.h

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index f2fea8ccce59e4ede3b2a105a819e6cdf2e0b876..6018e462192aa78fed4e18917b419ed57cea9175 100644 (file)
--- a/include/wx/mac/window.h
+++ b/include/wx/mac/window.h
@@ -12,11 +12,12 @@
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 

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

 #pragma interface "window.h"
 #endif
 
 #pragma interface "window.h"
 #endif
 

-#include <wx/brush.h>
+#include "wx/brush.h"
+

 // ---------------------------------------------------------------------------
 // forward declarations
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // forward declarations
 // ---------------------------------------------------------------------------


@@ -241,6 +242,7 @@ public:
     virtual void         Update() ;
     // for compatibility
     void                 MacUpdateImmediately() { Update() ; }
     virtual void         Update() ;
     // for compatibility
     void                 MacUpdateImmediately() { Update() ; }

+    bool                 MacSetupCursor( const wxPoint& pt ) ;

         
 //    virtual bool         MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* rootwin )  ;
 //    virtual void         MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) ;
         
 //    virtual bool         MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* rootwin )  ;
 //    virtual void         MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) ;