diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-02 14:57:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-02 14:57:42 (GMT) |
| commit | f535cf0342e434c63dee4ac17b18e376942dbedb (patch) | |
| tree | 5a0e8a119985298c99b2245d9b7fac365b9fb99a /macosx/tkMacOSXPrivate.h | |
| parent | d3c05cb7bc14ac6c30cc09aa71adcc82835c0ebc (diff) | |
| parent | 066d6dcb874a4f9bae3ba8f4d8fd54e460413e88 (diff) | |
| download | tk-f535cf0342e434c63dee4ac17b18e376942dbedb.zip tk-f535cf0342e434c63dee4ac17b18e376942dbedb.tar.gz tk-f535cf0342e434c63dee4ac17b18e376942dbedb.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'macosx/tkMacOSXPrivate.h')
| -rw-r--r-- | macosx/tkMacOSXPrivate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h index 4c02fe3..091b795 100644 --- a/macosx/tkMacOSXPrivate.h +++ b/macosx/tkMacOSXPrivate.h @@ -236,8 +236,6 @@ MODULE_SCOPE OSStatus TkMacOSHIShapeUnion(HIShapeRef inShape1, * Prototypes of TkAqua internal procs. */ -MODULE_SCOPE NSView * TkMacOSXGetNSViewForDrawable(Drawable drawable); -MODULE_SCOPE CGContextRef TkMacOSXGetCGContextForDrawable(Drawable drawable); MODULE_SCOPE void * TkMacOSXGetNamedSymbol(const char *module, const char *symbol); MODULE_SCOPE void TkMacOSXDisplayChanged(Display *display); @@ -260,10 +258,12 @@ MODULE_SCOPE void TkMacOSXRestoreDrawingContext( MODULE_SCOPE void TkMacOSXSetColorInContext(GC gc, unsigned long pixel, CGContextRef context); #define TkMacOSXGetNSWindowForDrawable(drawable) ((NSWindow*)TkMacOSXDrawable(drawable)) +#define TkMacOSXGetNSViewForDrawable(macWin) (NSView *)Tk_MacOSXGetNSViewForDrawable((Drawable)(macWin)) MODULE_SCOPE void TkMacOSXWinCGBounds(TkWindow *winPtr, CGRect *bounds); MODULE_SCOPE HIShapeRef TkMacOSXGetClipRgn(Drawable drawable); MODULE_SCOPE void TkMacOSXInvalidateViewRegion(NSView *view, HIShapeRef rgn); +MODULE_SCOPE CGContextRef TkMacOSXGetCGContextForDrawable(Drawable drawable); MODULE_SCOPE NSImage* TkMacOSXGetNSImageFromTkImage(Display *display, Tk_Image image, int width, int height); MODULE_SCOPE NSImage* TkMacOSXGetNSImageFromBitmap(Display *display, |