wxHelpController now wxCHMHelpController on Windows

[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 15391015a8691161219fa9da6446d3f76cb9e0c2..babd87cc440a83286181d449e0458782a3b03ace 100644 (file)
--- a/include/wx/mac/carbon/app.h
+++ b/include/wx/mac/carbon/app.h
@@ -21,6 +21,10 @@
 #include "wx/gdicmn.h"
 #include "wx/event.h"
 
 #include "wx/gdicmn.h"
 #include "wx/event.h"
 

+#ifdef __WXMAC_OSX__
+typedef struct __CFRunLoopSource * CFRunLoopSourceRef;
+#endif
+

 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindowMac;
 class WXDLLEXPORT wxApp ;
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindowMac;
 class WXDLLEXPORT wxApp ;


@@ -105,6 +109,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 ;
+#endif

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


@@ -123,7 +130,7 @@ public:
     static long           s_macMenuManagerVersion ;
     static bool           s_macHasDialogManager ;
     static long           s_macDialogManagerVersion ;
     static long           s_macMenuManagerVersion ;
     static bool           s_macHasDialogManager ;
     static long           s_macDialogManagerVersion ;

-
+    

     WXHRGN                m_macCursorRgn ;
     WXHRGN                m_macSleepRgn ;
     WXHRGN                m_macHelpRgn ;
     WXHRGN                m_macCursorRgn ;
     WXHRGN                m_macSleepRgn ;
     WXHRGN                m_macHelpRgn ;


@@ -135,8 +142,8 @@ public:
     // For embedded use. By default does nothing.
     virtual void          MacHandleUnhandledEvent( WXEVENTREF ev );
 
     // For embedded use. By default does nothing.
     virtual void          MacHandleUnhandledEvent( WXEVENTREF ev );
 

-    bool    MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;
-    bool    MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;
+    bool    MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ;
+    bool    MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ;

 
     virtual short         MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
     virtual short         MacHandleAEPDoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
 
     virtual short         MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
     virtual short         MacHandleAEPDoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;


@@ -156,20 +163,6 @@ public:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-class WXDLLEXPORT wxStAppResource
-{
-public:
-    wxStAppResource() ;
-    ~wxStAppResource() ;
-
-    // opaque pointer for CFragInitBlock
-    static void OpenSharedLibraryResource(const void *) ;
-    static void CloseSharedLibraryResource() ;
-
-private:
-    short       m_currentRefNum ;
-} ;
-

 #endif
     // _WX_APP_H_
 
 #endif
     // _WX_APP_H_