X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3b17ee74390803c2743455f5f3c744a2dd392ea..cc2608047b09f1fedfae027c083a35b1073010a4:/include/wx/osx/cocoa/private.h

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index ab8ba6b158..7b8b32008d 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -23,6 +23,9 @@
 #if wxOSX_USE_ATSU_TEXT
     // we need theming and atsu
     #include <Carbon/Carbon.h>
+#else
+    // we only need theming, if we find a better include replace the following
+    #include <Carbon/Carbon.h>
 #endif
 
 #ifdef __OBJC__
@@ -43,6 +46,7 @@ OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
                                const CGRect *  inBounds,
                                CGImageRef      inImage) ;
 WX_NSImage WXDLLIMPEXP_CORE wxOSXCreateNSImageFromCGImage( CGImageRef image );
+CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage );
 #endif
 
 long UMAGetSystemVersion() ;
@@ -129,6 +133,10 @@ public :
     virtual bool        DoHandleKeyEvent(NSEvent *event);
     virtual bool        DoHandleCharEvent(NSEvent *event, NSString *text);
     virtual void        DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
+    
+    virtual void        SetupKeyEvent(wxKeyEvent &wxevent, NSEvent * nsEvent, NSString* charString = NULL);
+    virtual void        SetupMouseEvent(wxMouseEvent &wxevent, NSEvent * nsEvent);
+
 
     void                SetFlipped(bool flipped);
     virtual bool        IsFlipped() const { return m_isFlipped; }