3 files changed, 11 insertions, 12 deletions
diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index 1951518..49736f0 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -307,8 +307,6 @@ TkpGetNativeAppBitmap(
 	}
     }
     if (image) {
-	*width = size.width;
-	*height = size.height;
 	pixmap = PixmapFromImage(display, image, NSSizeToCGSize(size));
     } else if (name) {
 	/*
@@ -323,6 +321,8 @@ TkpGetNativeAppBitmap(
 	    pixmap = PixmapFromImage(display, iconImage, NSSizeToCGSize(size));
 	}
     }
+    *width = size.width;
+    *height = size.height;
     return pixmap;
 }
 
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 0ddf627..3b451a0 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -47,36 +47,36 @@ static int		TkMacOSXGetAppPathCmd(ClientData cd, Tcl_Interp *ip,
 @synthesize tkPointerWindow = _tkPointerWindow;
 - (void) setTkPointerWindow: (TkWindow *)winPtr
 {
-    if (_tkPointerWindow) {
-	Tcl_Release(_tkPointerWindow);
-    }
     if (winPtr) {
 	Tcl_Preserve(winPtr);
     }
+    if (_tkPointerWindow) {
+	Tcl_Release(_tkPointerWindow);
+    }
     _tkPointerWindow = winPtr;
     return;
 }
 @synthesize tkEventTarget = _tkEventTarget;
 - (void) setTkEventTarget: (TkWindow *)winPtr
 {
-    if (_tkEventTarget) {
-	Tcl_Release(_tkEventTarget);
-    }
     if (winPtr) {
 	Tcl_Preserve(winPtr);
     }
+    if (_tkEventTarget) {
+	Tcl_Release(_tkEventTarget);
+    }
     _tkEventTarget = winPtr;
     return;
 }
 @synthesize tkDragTarget = _tkDragTarget;
 - (void) setTkDragTarget: (TkWindow *)winPtr
 {
-    if (_tkDragTarget) {
-	Tcl_Release(_tkDragTarget);
-    }
     if (winPtr) {
 	Tcl_Preserve(winPtr);
     }
+    if (_tkDragTarget) {
+	Tcl_Release(_tkDragTarget);
+    }
     _tkDragTarget = winPtr;
     return;
 }
diff --git a/macosx/tkMacOSXInt.h b/macosx/tkMacOSXInt.h
index 61771a0..e94ce0e 100644
--- a/macosx/tkMacOSXInt.h
+++ b/macosx/tkMacOSXInt.h
@@ -178,7 +178,6 @@ MODULE_SCOPE TkMacOSXEmbedHandler *tkMacOSXEmbedHandler;
 MODULE_SCOPE void TkMacOSXDefaultStartupScript(void);
 MODULE_SCOPE void TkpClipDrawableToRect(Display *display, Drawable d, int x,
 	int y, int width, int height);
-MODULE_SCOPE void TkpShiftButton(NSButton *button, NSPoint delta);
 MODULE_SCOPE Bool TkTestLogDisplay(Drawable drawable);
 
 /*