summaryrefslogtreecommitdiffstats
path: root/mac
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-01 22:29:19 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-01 22:29:19 (GMT)
commite35d614587b25a1a03ededdf2d04bcbfca86be70 (patch)
tree5bc13e4395b89309cb5eb55ee6a0b1d763975de7 /mac
parentc985425b2f03e2e14bf3f7ee9884cd74c184373e (diff)
downloadtk-e35d614587b25a1a03ededdf2d04bcbfca86be70.zip
tk-e35d614587b25a1a03ededdf2d04bcbfca86be70.tar.gz
tk-e35d614587b25a1a03ededdf2d04bcbfca86be70.tar.bz2
Change XSetDashes signature and many others to match Xorg, needed for Cygwin.
Add .PHONY targets, and various quoting issues (Makefile.in)
Diffstat (limited to 'mac')
-rw-r--r--mac/tkMacClipboard.c8
-rw-r--r--mac/tkMacColor.c6
-rw-r--r--mac/tkMacDraw.c5
-rw-r--r--mac/tkMacKeyboard.c3
-rw-r--r--mac/tkMacXStubs.c6
5 files changed, 17 insertions, 11 deletions
diff --git a/mac/tkMacClipboard.c b/mac/tkMacClipboard.c
index 953ae23..c25dc69 100644
--- a/mac/tkMacClipboard.c
+++ b/mac/tkMacClipboard.c
@@ -107,7 +107,7 @@ TkSelGetSelection(
*----------------------------------------------------------------------
*/
-void
+int
XSetSelectionOwner(
Display* display, /* X Display. */
Atom selection, /* What selection to own. */
@@ -132,11 +132,11 @@ XSetSelectionOwner(
*/
dispPtr = TkGetMainInfoList()->winPtr->dispPtr;
- if (dispPtr->clipboardActive) {
- return;
+ if (!dispPtr->clipboardActive) {
+ ZeroScrap();
}
- ZeroScrap();
}
+ return Success;
}
/*
diff --git a/mac/tkMacColor.c b/mac/tkMacColor.c
index 6c3c230..dad7396 100644
--- a/mac/tkMacColor.c
+++ b/mac/tkMacColor.c
@@ -141,14 +141,15 @@ XCreateColormap(
return index++;
}
-void
+int
XFreeColormap(
Display* display, /* Display. */
Colormap colormap) /* Colormap. */
{
+ return Success;
}
-void
+int
XFreeColors(
Display* display, /* Display. */
Colormap colormap, /* Colormap. */
@@ -161,6 +162,7 @@ XFreeColors(
* needs to be done to release colors as there really is
* no colormap in the Tk sense.
*/
+ return Success;
}
/*
diff --git a/mac/tkMacDraw.c b/mac/tkMacDraw.c
index 720dd71..5fd718e 100644
--- a/mac/tkMacDraw.c
+++ b/mac/tkMacDraw.c
@@ -276,7 +276,7 @@ XCopyPlane(
*----------------------------------------------------------------------
*/
-void
+int
TkPutImage(
unsigned long *colors, /* Unused on Macintosh. */
int ncolors, /* Unused on Macintosh. */
@@ -381,6 +381,7 @@ TkPutImage(
ckfree(newData);
}
SetGWorld(saveWorld, saveDevice);
+ return Success;
}
/*
@@ -433,7 +434,7 @@ XFillRectangles(
}
SetGWorld(saveWorld, saveDevice);
- return 1;
+ return Success;
}
/*
diff --git a/mac/tkMacKeyboard.c b/mac/tkMacKeyboard.c
index 07b57c0..a79d813 100644
--- a/mac/tkMacKeyboard.c
+++ b/mac/tkMacKeyboard.c
@@ -293,7 +293,7 @@ XGetModifierMapping(
*----------------------------------------------------------------------
*/
-void
+int
XFreeModifiermap(
XModifierKeymap *modmap)
{
@@ -301,6 +301,7 @@ XFreeModifiermap(
ckfree((char *) modmap->modifiermap);
}
ckfree((char *) modmap);
+ return Success;
}
/*
diff --git a/mac/tkMacXStubs.c b/mac/tkMacXStubs.c
index 1e0ad51..aff29dc 100644
--- a/mac/tkMacXStubs.c
+++ b/mac/tkMacXStubs.c
@@ -395,12 +395,13 @@ XSelectInput(
Debugger();
}
-void
+int
XBell(
Display* display,
int percent)
{
SysBeep(percent);
+ return Success;
}
void
@@ -528,7 +529,7 @@ XDrawPoints(
}
*/
-void
+int
XWarpPointer(
Display* display,
Window src_w,
@@ -540,6 +541,7 @@ XWarpPointer(
int dest_x,
int dest_y)
{
+ return Success;
}
void