removed wxABI_VERSION checks

[wxWidgets.git] / include / wx / mac / carbon / app.h

diff --git a/include/wx/mac/carbon/app.h b/include/wx/mac/carbon/app.h
index f0bf02512e32ac06243c3c57805e23e4dd8c32cb..4075fe1e0067f1ed5c70a2990e2045d3026c1f88 100644 (file)
--- a/include/wx/mac/carbon/app.h
+++ b/include/wx/mac/carbon/app.h
@@ -12,19 +12,13 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "app.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 #include "wx/event.h"
 
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 #include "wx/event.h"
 

-#ifdef __DARWIN__
-#include <CoreFoundation/CoreFoundation.h>
-#else
-#include <CoreFoundation.h>
+#ifdef __WXMAC_OSX__
+typedef struct __CFRunLoopSource * CFRunLoopSourceRef;

 #endif
 
 class WXDLLEXPORT wxFrame;
 #endif
 
 class WXDLLEXPORT wxFrame;


@@ -111,7 +105,9 @@ private:
     WXEVENTHANDLERREF     m_macEventHandler ;
     WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;
     WXEVENTREF            m_macCurrentEvent ;
     WXEVENTHANDLERREF     m_macEventHandler ;
     WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;
     WXEVENTREF            m_macCurrentEvent ;

+#ifdef __WXMAC_OSX__

     CFRunLoopSourceRef    m_macEventPosted ;
     CFRunLoopSourceRef    m_macEventPosted ;

+#endif

 
 public:
     static bool           s_macSupportPCMenuShortcuts ;
 
 public:
     static bool           s_macSupportPCMenuShortcuts ;