X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5d05b907c823c87f7d4f92e535c15a7ee0124f2..43ff861df48f0837dac98005dd397c5f127ca136:/include/wx/osx/cocoa/private.h diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index ec69ce31d0..0bdaa13c59 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -14,26 +14,23 @@ #ifndef _WX_PRIVATE_COCOA_H_ #define _WX_PRIVATE_COCOA_H_ -#include "wx/osx/core/private.h" - -#include "wx/defs.h" - #include -#if wxOSX_USE_ATSU_TEXT - // we need theming and atsu - #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; @@ -42,35 +39,37 @@ OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage( CGContextRef inContext, const CGRect * inBounds, CGImageRef inImage) ; -WX_NSImage WXDLLIMPEXP_CORE wxOSXCreateNSImageFromCGImage( CGImageRef image ); -#endif +WX_NSImage WXDLLIMPEXP_CORE wxOSXGetNSImageFromCGImage( CGImageRef image ); +CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage ); +wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxString &client, const wxSize& size); -long UMAGetSystemVersion() ; -WXDLLIMPEXP_BASE void wxMacStringToPascal( const wxString&from , StringPtr to ); -WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL ); -WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ); -WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ); - -// -// -// - -#if wxUSE_GUI +class WXDLLIMPEXP_FWD_CORE wxDialog; 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 ); @@ -78,6 +77,7 @@ public : virtual WXWidget GetWXWidget() const { return m_osxView; } virtual void SetBackgroundColour(const wxColour&); + virtual bool SetBackgroundStyle(wxBackgroundStyle style); virtual void GetContentArea( int &left , int &top , int &width , int &height ) const; virtual void Move(int x, int y, int width, int height); @@ -122,13 +122,18 @@ public : void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ); void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ); + void SetToolTip( wxToolTip* tooltip ); void InstallEventHandler( WXWidget control = NULL ); - - virtual bool DoHandleMouseEvent(NSEvent *event); + + 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 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; } @@ -149,18 +154,22 @@ public : 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); + // 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 + // events, don't resend them bool m_hasEditor; - + DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl) }; @@ -171,76 +180,90 @@ 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 ) ; - + void Create( wxWindow* parent, WXWindow nativeWindow ); + 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 ; + WXWindow m_macWindow; + void * m_macFullScreenData ; DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl) -}; +}; #ifdef __OBJC__ + WXDLLIMPEXP_CORE NSScreen* wxOSXGetMenuScreen(); 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 , + + NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin = true ); - + // used for many wxControls - + @interface wxNSButton : NSButton { + NSTrackingRectTag rectTag; } - + @end @interface wxNSBox : NSBox @@ -256,7 +279,7 @@ protected : @end - @interface wxNSTextField : NSTextField + @interface wxNSTextField : NSTextField wxOSX_10_6_AND_LATER() { wxNSTextFieldEditor* fieldEditor; } @@ -266,17 +289,19 @@ protected : @end - @interface wxNSSecureTextField : NSSecureTextField + @interface wxNSSecureTextField : NSSecureTextField wxOSX_10_6_AND_LATER() { } @end - @interface wxNSTextView : NSTextView + @interface wxNSTextView : NSTextView wxOSX_10_6_AND_LATER() { } - + + - (void)textDidChange:(NSNotification *)aNotification; + @end @interface wxNSMenu : NSMenu @@ -287,7 +312,7 @@ protected : - (void) setImplementation:(wxMenuImpl*) item; - (wxMenuImpl*) implementation; - @end + @end @interface wxNSMenuItem : NSMenuItem { @@ -300,8 +325,8 @@ protected : - (void)clickedAction:(id)sender; - (BOOL)validateMenuItem:(NSMenuItem *)menuItem; - @end - + @end + void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c); /* @@ -313,14 +338,21 @@ protected : { 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 + @interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER() + { + } + + @end #endif // __OBJC__ @@ -354,7 +386,8 @@ const short kwxCursorSize = 11; const short kwxCursorSizeNESW = 12; const short kwxCursorSizeNWSE = 13; const short kwxCursorRoller = 14; -const short kwxCursorLast = kwxCursorRoller; +const short kwxCursorWatch = 15; +const short kwxCursorLast = kwxCursorWatch; // exposing our fallback cursor map