Tk Source Code

Artifact fde442f53463218aa2c693fa240feef66dbfe27b:

Attachment "tk8_5_15_fix_merge.patch" to ticket [8eb56719] added by ned.deily 2013-09-15 23:27:18. (unpublished)

---

diff --git a/macosx/tkMacOSXClipboard.c b/macosx/tkMacOSXClipboard.c
--- a/macosx/tkMacOSXClipboard.c
+++ b/macosx/tkMacOSXClipboard.c
@@ -168,6 +168,7 @@
 	    changeCount = [pb declareTypes:[NSArray array] owner:NSApp];
 	}
     }
+    return Success;
 }
 
 /*
@@ -194,7 +195,6 @@
     if (winPtr && winPtr == (TkWindow *)clipboardOwner) {
 	clipboardOwner = NULL;
     }
-    return Success;
 }
 
 /*
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -347,6 +347,7 @@
 	TkMacOSXDbgMsg("Invalid destination drawable");
     }
     TkMacOSXRestoreDrawingContext(&dc);
+    return Success;
 }
 
 /*
@@ -744,7 +745,6 @@
     } else {
 	TkMacOSXDbgMsg("Drawing of empty CGImage requested");
     }
-    return Success;
 }
 
 /*