X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1821877f7f20c454ef908171368ab20067fbe3cf..8e6efd1fd2f6cedda23140aff17f56b26ef7c2d2:/include/wx/osx/cocoa/private.h diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index 6ac6f6d2ed..d9bf8338d1 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -46,7 +46,7 @@ OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage( const CGRect * inBounds, CGImageRef inImage) ; WX_NSImage WXDLLIMPEXP_CORE wxOSXCreateNSImageFromCGImage( CGImageRef image ); -CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSSImage( WX_NSImage nsimage ); +CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage ); #endif long UMAGetSystemVersion() ; @@ -73,6 +73,17 @@ public : 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(); @@ -190,7 +201,10 @@ public : void Raise(); void Lower(); bool Show(bool show); - bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout); + + virtual bool ShowWithEffect(bool show, + wxShowEffect effect, + unsigned timeout); void Update(); bool SetTransparent(wxByte alpha); @@ -247,6 +261,7 @@ protected : @interface wxNSButton : NSButton { + NSTrackingRectTag rectTag; } @end