X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cb2a2418394a693447b9fe135458209d7ba81e8..9ab7ff537d1ead0f0b07c14841474203c7fa59ba:/include/wx/osx/cocoa/private.h diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index fb8f330b3d..41d450500e 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 +#else + // we only need theming, if we find a better include replace the following + #include #endif #ifdef __OBJC__ @@ -33,7 +36,7 @@ // 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 +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() ; @@ -60,17 +64,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 ); @@ -106,7 +121,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,11 +139,15 @@ 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 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; } @@ -147,7 +168,7 @@ 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); @@ -156,9 +177,9 @@ protected: 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) }; @@ -169,59 +190,67 @@ class wxNonOwnedWindowCocoaImpl : public wxNonOwnedWindowImpl public : wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) ; wxNonOwnedWindowCocoaImpl(); - + virtual ~wxNonOwnedWindowCocoaImpl(); - + virtual void Destroy() ; 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(); wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } protected : WX_wxNSWindow m_macWindow; void * m_macFullScreenData ; DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl) -}; +}; #ifdef __OBJC__ @@ -229,16 +258,17 @@ protected : 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 @@ -271,10 +301,12 @@ protected : @end - @interface wxNSTextView : NSTextView + @interface wxNSTextView : NSTextView { } + - (void)textDidChange:(NSNotification *)aNotification; + @end @interface wxNSMenu : NSMenu @@ -285,7 +317,7 @@ protected : - (void) setImplementation:(wxMenuImpl*) item; - (wxMenuImpl*) implementation; - @end + @end @interface wxNSMenuItem : NSMenuItem { @@ -298,8 +330,8 @@ protected : - (void)clickedAction:(id)sender; - (BOOL)validateMenuItem:(NSMenuItem *)menuItem; - @end - + @end + void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c); /*