X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19c7ac3d3bf1ac2113505a805a79c40ce3db1f5b..06b76f7e8ba4f5882ade265e30d5b4f57eb61e23:/include/wx/osx/cocoa/private.h diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index d1c7059d7e..709a39dbbe 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -23,17 +23,26 @@ #if wxOSX_USE_ATSU_TEXT // we need theming and atsu #include +#else + // we only need theming, if we find a better include replace the following + #include #endif #ifdef __OBJC__ #import #endif +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 +// available in 10.4 but not in the headers +enum { + kEventMouseScroll = 11 +}; +#endif // // shared between Cocoa and Carbon // -// bring in themeing types without pulling in the headers +// bring in theming types without pulling in the headers #if wxUSE_GUI typedef SInt16 ThemeBrush; @@ -43,6 +52,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() ; @@ -51,6 +61,8 @@ WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef add WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ); WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ); +class WXDLLIMPEXP_FWD_CORE wxDialog; + // // // @@ -60,17 +72,28 @@ WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl { public : - wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ; - wxWidgetCocoaImpl() ; - ~wxWidgetCocoaImpl(); - + wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ; + wxWidgetCocoaImpl() ; + ~wxWidgetCocoaImpl(); + void Init(); - + virtual bool IsVisible() const ; virtual void SetVisibility(bool); + // we provide a static function which can be reused from + // wxNonOwnedWindowCocoaImpl too + static bool ShowViewOrWindowWithEffect(wxWindow *win, + bool show, + wxShowEffect effect, + unsigned timeout); + + virtual bool ShowWithEffect(bool show, + wxShowEffect effect, + unsigned timeout); + virtual void Raise(); - + virtual void Lower(); virtual void ScrollRect( const wxRect *rect, int dx, int dy ); @@ -98,7 +121,7 @@ public : void SetDefaultButton( bool isDefault ); void PerformClick(); - void SetLabel(const wxString& title, wxFontEncoding encoding); + virtual void SetLabel(const wxString& title, wxFontEncoding encoding); void SetCursor( const wxCursor & cursor ); void CaptureMouse(); @@ -106,7 +129,9 @@ public : wxInt32 GetValue() const; void SetValue( wxInt32 v ); + wxBitmap GetBitmap() const; void SetBitmap( const wxBitmap& bitmap ); + void SetBitmapPosition( wxDirection dir ); void SetupTabs( const wxNotebook ¬ebook ); void GetBestRect( wxRect *r ) const; bool IsEnabled() const; @@ -122,13 +147,51 @@ public : void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ); void InstallEventHandler( WXWidget control = NULL ); + + virtual bool DoHandleMouseEvent(NSEvent *event); + 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; } + + // cocoa thunk connected calls + + virtual unsigned int draggingEntered(void* sender, WXWidget slf, void* _cmd); + virtual void draggingExited(void* sender, WXWidget slf, void* _cmd); + virtual unsigned int draggingUpdated(void* sender, WXWidget slf, void* _cmd); + virtual bool performDragOperation(void* sender, WXWidget slf, void* _cmd); + virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd); + virtual void keyEvent(WX_NSEvent event, WXWidget slf, void* _cmd); + virtual void insertText(NSString* text, WXWidget slf, void* _cmd); + virtual bool performKeyEquivalent(WX_NSEvent event, WXWidget slf, void* _cmd); + virtual bool acceptsFirstResponder(WXWidget slf, void* _cmd); + virtual bool becomeFirstResponder(WXWidget slf, void* _cmd); + virtual bool resignFirstResponder(WXWidget slf, void* _cmd); + virtual void resetCursorRects(WXWidget slf, void* _cmd); + virtual bool isFlipped(WXWidget slf, void* _cmd); + virtual void drawRect(void* rect, WXWidget slf, void* _cmd); + + virtual void controlAction(WXWidget slf, void* _cmd, void* sender); + virtual void controlDoubleAction(WXWidget slf, void* _cmd, void *sender); - virtual bool DoHandleMouseEvent(NSEvent *event); - virtual bool DoHandleKeyEvent(NSEvent *event); - virtual void DoNotifyFocusEvent(bool receivedFocus); + // for wxTextCtrl-derived classes, put here since they don't all derive + // from the same pimpl class. + virtual void controlTextDidChange(); protected: WXWidget m_osxView; + NSEvent* m_lastKeyDownEvent; + bool m_isFlipped; + // if it the control has an editor, that editor will already send some + // events, don't resend them + bool m_hasEditor; + DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl) }; @@ -139,281 +202,126 @@ class wxNonOwnedWindowCocoaImpl : public wxNonOwnedWindowImpl public : wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) ; wxNonOwnedWindowCocoaImpl(); - + virtual ~wxNonOwnedWindowCocoaImpl(); - - virtual void Destroy() ; + + virtual void WillBeDestroyed() ; void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, long style, long extraStyle, const wxString& name ) ; - + WXWindow GetWXWindow() const; - void Raise(); + void Raise(); void Lower(); - bool Show(bool show); - bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout); - + bool Show(bool show); + + virtual bool ShowWithEffect(bool show, + wxShowEffect effect, + unsigned timeout); + void Update(); bool SetTransparent(wxByte alpha); bool SetBackgroundColour(const wxColour& col ); - void SetExtraStyle( long exStyle ); - bool SetBackgroundStyle(wxBackgroundStyle style); + void SetExtraStyle( long exStyle ); + void SetWindowStyleFlag( long style ); + bool SetBackgroundStyle(wxBackgroundStyle style); bool CanSetTransparent(); void MoveWindow(int x, int y, int width, int height); void GetPosition( int &x, int &y ) const; void GetSize( int &width, int &height ) const; - void GetContentArea( int &left , int &top , int &width , int &height ) const; + void GetContentArea( int &left , int &top , int &width , int &height ) const; bool SetShape(const wxRegion& region); - + virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ; - + virtual bool IsMaximized() const; - + virtual bool IsIconized() const; - + virtual void Iconize( bool iconize ); - + virtual void Maximize(bool maximize); - + virtual bool IsFullScreen() const; - + virtual bool ShowFullScreen(bool show, long style); + virtual void ShowWithoutActivating(); + virtual void RequestUserAttention(int flags); - + virtual void ScreenToWindow( int *x, int *y ); - + virtual void WindowToScreen( int *x, int *y ); + + virtual bool IsActive(); + virtual void SetModified(bool modified); + virtual bool IsModified() const; + wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } protected : WX_wxNSWindow m_macWindow; void * m_macFullScreenData ; DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl) -}; +}; #ifdef __OBJC__ - extern NSRect wxToNSRect( NSView* parent, const wxRect& r ); - extern wxRect wxFromNSRect( NSView* parent, const NSRect& rect ); - extern NSPoint wxToNSPoint( NSView* parent, const wxPoint& p ); - extern wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p ); - - NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , + WXDLLIMPEXP_CORE NSRect wxToNSRect( NSView* parent, const wxRect& r ); + WXDLLIMPEXP_CORE wxRect wxFromNSRect( NSView* parent, const NSRect& rect ); + WXDLLIMPEXP_CORE NSPoint wxToNSPoint( NSView* parent, const wxPoint& p ); + WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p ); + + NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin = true ); - - // common code snippets for cocoa implementations - // later to be done using injection in method table - - #define WXCOCOAIMPL_COMMON_EVENTS_INTERFACE -(void)mouseDown:(NSEvent *)event ;\ - - (void)rightMouseDown:(NSEvent *)event ;\ - - (void)otherMouseDown:(NSEvent *)event ;\ - - (void)mouseUp:(NSEvent *)event ;\ - - (void)rightMouseUp:(NSEvent *)event ;\ - - (void)otherMouseUp:(NSEvent *)event ;\ - - (void)mouseMoved:(NSEvent *)event;\ - - (void)mouseDragged:(NSEvent *)event;\ - - (void)rightMouseDragged:(NSEvent *)event;\ - - (void)otherMouseDragged:(NSEvent *)event;\ - - (void)scrollWheel:(NSEvent *)theEvent;\ - - (void)mouseEntered:(NSEvent *)event;\ - - (void)mouseExited:(NSEvent *)event;\ - - (void)keyDown:(NSEvent *)event;\ - - (void)keyUp:(NSEvent *)event;\ - - (BOOL)performKeyEquivalent:(NSEvent *)event;\ - - (void)flagsChanged:(NSEvent *)event;\ - - (BOOL)becomeFirstResponder;\ - - (BOOL)resignFirstResponder;\ - - (void)resetCursorRects; - - - #define WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION_NO_MOUSEDOWN -(void)rightMouseDown:(NSEvent *)event\ - {\ - if ( !impl->DoHandleMouseEvent(event) )\ - [super rightMouseDown:event];\ - }\ - -(void)otherMouseDown:(NSEvent *)event\ - {\ - if ( !impl->DoHandleMouseEvent(event) )\ - [super otherMouseDown:event];\ - }\ - -(void)mouseUp:(NSEvent *)event\ - {\ - if ( !impl->DoHandleMouseEvent(event) )\ - [super mouseUp:event];\ - }\ - -(void)rightMouseUp:(NSEvent *)event\ - {\ - if ( !impl->DoHandleMouseEvent(event) )\ - [super rightMouseUp:event];\ - }\ - -(void)otherMouseUp:(NSEvent *)event\ - {\ - if ( !impl->DoHandleMouseEvent(event) )\ - [super otherMouseUp:event];\ - }\ - -(void)mouseMoved:(NSEvent *)event\ - {\ - if ( !impl->DoHandleMouseEvent(event) )\ - [super mouseMoved:event];\ - }\ - -(void)mouseDragged:(NSEvent *)event\ - {\ - if ( !impl->DoHandleMouseEvent(event) )\ - [super mouseDragged:event];\ - }\ - -(void)rightMouseDragged:(NSEvent *)event\ - {\ - if ( !impl->DoHandleMouseEvent(event) )\ - [super rightMouseDragged:event];\ - }\ - -(void)otherMouseDragged:(NSEvent *)event\ - {\ - if ( !impl->DoHandleMouseEvent(event) )\ - [super otherMouseDragged:event];\ - }\ - -(void)scrollWheel:(NSEvent *)event\ - {\ - if ( !impl->DoHandleMouseEvent(event) )\ - [super scrollWheel:event];\ - }\ - -(void)mouseEntered:(NSEvent *)event\ - {\ - if ( !impl->DoHandleMouseEvent(event) )\ - [super mouseEntered:event];\ - }\ - -(void)mouseExited:(NSEvent *)event\ - {\ - if ( !impl->DoHandleMouseEvent(event) )\ - [super mouseExited:event];\ - }\ - -(BOOL)performKeyEquivalent:(NSEvent *)event\ - {\ - if ( !impl->DoHandleKeyEvent(event) )\ - return [super performKeyEquivalent:event];\ - return YES;\ - }\ - -(void)keyDown:(NSEvent *)event\ - {\ - if ( !impl->DoHandleKeyEvent(event) )\ - [super keyDown:event];\ - }\ - -(void)keyUp:(NSEvent *)event\ - {\ - if ( !impl->DoHandleKeyEvent(event) )\ - [super keyUp:event];\ - }\ - -(void)flagsChanged:(NSEvent *)event\ - {\ - if ( !impl->DoHandleKeyEvent(event) )\ - [super flagsChanged:event];\ - }\ - - (BOOL) becomeFirstResponder\ - {\ - BOOL r = [super becomeFirstResponder];\ - if ( r )\ - impl->DoNotifyFocusEvent( true );\ - return r;\ - }\ - - (BOOL) resignFirstResponder\ - {\ - BOOL r = [super resignFirstResponder];\ - if ( r )\ - impl->DoNotifyFocusEvent( false );\ - return r;\ - }\ - - (void) resetCursorRects\ - {\ - if ( impl )\ - {\ - wxWindow* wxpeer = impl->GetWXPeer();\ - if ( wxpeer )\ - {\ - NSCursor *cursor = (NSCursor*)wxpeer->GetCursor().GetHCURSOR();\ - if (cursor == NULL)\ - [super resetCursorRects];\ - else\ - [self addCursorRect: [self bounds]\ - cursor: cursor];\ - }\ - }\ - } - - #define WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION -(void)mouseDown:(NSEvent *)event \ - {\ - if ( !impl->DoHandleMouseEvent(event) )\ - [super mouseDown:event];\ - }\ - WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION_NO_MOUSEDOWN - - #define WXCOCOAIMPL_COMMON_MEMBERS wxWidgetCocoaImpl* impl; - - #define WXCOCOAIMPL_COMMON_INTERFACE \ - - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation;\ - - (wxWidgetCocoaImpl*) implementation;\ - - (BOOL) isFlipped;\ - WXCOCOAIMPL_COMMON_EVENTS_INTERFACE - - #define WXCOCOAIMPL_COMMON_IMPLEMENTATION_BASE - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation\ - {\ - impl = theImplementation;\ - }\ - - (wxWidgetCocoaImpl*) implementation\ - {\ - return impl;\ - }\ - - #define WXCOCOAIMPL_COMMON_IMPLEMENTATION WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION \ - WXCOCOAIMPL_COMMON_IMPLEMENTATION_BASE \ - - (BOOL) isFlipped\ - {\ - return YES;\ - } - - #define WXCOCOAIMPL_COMMON_IMPLEMENTATION_NO_MOUSEDOWN WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION_NO_MOUSEDOWN \ - WXCOCOAIMPL_COMMON_IMPLEMENTATION_BASE \ - - (BOOL) isFlipped\ - {\ - return YES;\ - } - - - #define WXCOCOAIMPL_COMMON_IMPLEMENTATION_NOT_FLIPPED WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION \ - WXCOCOAIMPL_COMMON_IMPLEMENTATION_BASE \ - - (BOOL) isFlipped\ - {\ - return NO;\ - } // used for many wxControls - + @interface wxNSButton : NSButton { - WXCOCOAIMPL_COMMON_MEMBERS + NSTrackingRectTag rectTag; } - WXCOCOAIMPL_COMMON_INTERFACE - - (void) clickedAction: (id) sender; - @end @interface wxNSBox : NSBox { - WXCOCOAIMPL_COMMON_MEMBERS } - WXCOCOAIMPL_COMMON_INTERFACE + @end + + @interface wxNSTextFieldEditor : NSTextView + { + NSEvent* lastKeyDownEvent; + } @end - @interface wxNSTextField : NSTextField + @interface wxNSTextField : NSTextField wxOSX_10_6_AND_LATER() { - WXCOCOAIMPL_COMMON_MEMBERS + wxNSTextFieldEditor* fieldEditor; } - WXCOCOAIMPL_COMMON_INTERFACE - + - (wxNSTextFieldEditor*) fieldEditor; + - (void) setFieldEditor:(wxNSTextFieldEditor*) fieldEditor; + + @end + + @interface wxNSSecureTextField : NSSecureTextField wxOSX_10_6_AND_LATER() + { + } + + @end + + + @interface wxNSTextView : NSTextView wxOSX_10_6_AND_LATER() + { + } + + - (void)textDidChange:(NSNotification *)aNotification; + @end @interface wxNSMenu : NSMenu @@ -424,7 +332,7 @@ protected : - (void) setImplementation:(wxMenuImpl*) item; - (wxMenuImpl*) implementation; - @end + @end @interface wxNSMenuItem : NSMenuItem { @@ -437,7 +345,29 @@ protected : - (void)clickedAction:(id)sender; - (BOOL)validateMenuItem:(NSMenuItem *)menuItem; - @end + @end + + void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c); + + /* + We need this for ShowModal, as the sheet just disables the parent window and + returns control to the app, whereas we don't want to return from ShowModal + until the sheet has been dismissed. + */ + @interface ModalDialogDelegate : NSObject + { + BOOL sheetFinished; + int resultCode; + wxDialog* impl; + } + + - (void)setImplementation: (wxDialog *)dialog; + - (BOOL)finished; + - (int)code; + - (void)waitForSheetToFinish; + - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo; + @end + #endif // __OBJC__