diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-18 21:55:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-18 21:55:51 (GMT) |
| commit | 4efa3179d5ee036975a86e6ce5986f305651b45d (patch) | |
| tree | b25183d5923d60c27cc257ad57307cf2500bc8bd /macosx | |
| parent | 452f3387dfdfe45cb1fc59b28657e5111a2778d8 (diff) | |
| parent | 416295a661f5c8f30dfe0751b5618c6a51173034 (diff) | |
| download | tk-4efa3179d5ee036975a86e6ce5986f305651b45d.zip tk-4efa3179d5ee036975a86e6ce5986f305651b45d.tar.gz tk-4efa3179d5ee036975a86e6ce5986f305651b45d.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXDraw.c | 13 | ||||
| -rw-r--r-- | macosx/tkMacOSXSubwindows.c | 9 | ||||
| -rw-r--r-- | macosx/tkMacOSXXStubs.c | 8 |
3 files changed, 18 insertions, 12 deletions
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c index f985931..ef57265 100644 --- a/macosx/tkMacOSXDraw.c +++ b/macosx/tkMacOSXDraw.c @@ -906,7 +906,7 @@ XFillPolygon( *---------------------------------------------------------------------- */ -void +int XDrawRectangle( Display *display, /* Display. */ Drawable d, /* Draw on this. */ @@ -920,12 +920,12 @@ XDrawRectangle( int lw = gc->line_width; if (width == 0 || height == 0) { - return; + return BadDrawable; } display->request++; if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) { - return; + return BadDrawable; } if (dc.context) { CGRect rect; @@ -937,6 +937,7 @@ XDrawRectangle( CGContextStrokeRect(dc.context, rect); } TkMacOSXRestoreDrawingContext(&dc); + return Success; } #ifdef TK_MACOSXDRAW_UNUSED @@ -1266,7 +1267,7 @@ XDrawArcs( *---------------------------------------------------------------------- */ -void +int XFillArc( Display *display, /* Display. */ Drawable d, /* Draw on this. */ @@ -1282,12 +1283,12 @@ XFillArc( int lw = gc->line_width; if (width == 0 || height == 0 || angle2 == 0) { - return; + return BadDrawable; } display->request++; if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) { - return; + return BadDrawable; } if (dc.context) { CGRect rect; diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c index b660917..1c63870 100644 --- a/macosx/tkMacOSXSubwindows.c +++ b/macosx/tkMacOSXSubwindows.c @@ -394,7 +394,7 @@ XResizeWindow( *---------------------------------------------------------------------- */ -void +int XMoveResizeWindow( Display *display, /* Display. */ Window window, /* Window. */ @@ -430,6 +430,7 @@ XMoveResizeWindow( } else { MoveResizeWindow(macWin); } + return Success; } /* @@ -448,7 +449,7 @@ XMoveResizeWindow( *---------------------------------------------------------------------- */ -void +int XMoveWindow( Display *display, /* Display. */ Window window, /* Window. */ @@ -467,6 +468,7 @@ XMoveWindow( } else { MoveResizeWindow(macWin); } + return Success; } /* @@ -661,7 +663,7 @@ XLowerWindow( *---------------------------------------------------------------------- */ -void +int XConfigureWindow( Display *display, /* Display. */ Window w, /* Window. */ @@ -708,6 +710,7 @@ XConfigureWindow( TkGenWMMoveRequestEvent(macWin->winPtr, macWin->winPtr->changes.x, macWin->winPtr->changes.y); #endif + return Success; } /* diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index 3cd70a7..b8e67a4 100644 --- a/macosx/tkMacOSXXStubs.c +++ b/macosx/tkMacOSXXStubs.c @@ -435,7 +435,7 @@ XGetGeometry( return 1; } -void +int XChangeProperty( Display* display, Window w, @@ -447,6 +447,7 @@ XChangeProperty( int nelements) { Debugger(); + return Success; } void @@ -768,13 +769,14 @@ TkGetServerInfo( *---------------------------------------------------------------------- */ -void +int XChangeWindowAttributes( Display *display, Window w, unsigned long value_mask, XSetWindowAttributes *attributes) { + return Success; } void @@ -846,7 +848,7 @@ XSetWMClientMachine( } XIC -XCreateIC(void) +XCreateIC(XIM xim, ...) { Debugger(); return (XIC) 0; |