summaryrefslogtreecommitdiffstats
path: root/carbon/tkMacOSXWm.c
diff options
context:
space:
mode:
authordas <das>2009-06-29 14:35:01 (GMT)
committerdas <das>2009-06-29 14:35:01 (GMT)
commit8f9b8fd63b4da5f6f27b46c438c89f2baa15f0e8 (patch)
tree81b5743d2ff5d45f2ee4992153e4f34949ea8f8a /carbon/tkMacOSXWm.c
parente4a87c21cb59539eeddcc65d359e9b06d597fed3 (diff)
downloadtk-83a65d1ab20a8ae35f03c4f6b3c9fe1b02c306fa.zip
tk-83a65d1ab20a8ae35f03c4f6b3c9fe1b02c306fa.tar.gz
tk-83a65d1ab20a8ae35f03c4f6b3c9fe1b02c306fa.tar.bz2
Merge of TkAqua Cocoa portmacosx_cocoa_merge
Diffstat (limited to 'carbon/tkMacOSXWm.c')
-rw-r--r--carbon/tkMacOSXWm.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/carbon/tkMacOSXWm.c b/carbon/tkMacOSXWm.c
index cd8ee6a..e5707f6 100644
--- a/carbon/tkMacOSXWm.c
+++ b/carbon/tkMacOSXWm.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXWm.c,v 1.1 2009/06/26 01:42:47 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.2 2009/06/29 14:35:01 das Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -4608,9 +4608,10 @@ TkMacOSXResizable(
int
TkMacOSXGrowToplevel(
- WindowRef whichWindow,
- Point start)
+ void *whichWindow,
+ XPoint s)
{
+ Point start = {s.y, s.x};
Point where = start;
TkDisplay *dispPtr;
Rect portRect;
@@ -4792,7 +4793,7 @@ TkGetTransientMaster(
Window
TkMacOSXGetXWindow(
- WindowRef macWinPtr)
+ void *macWinPtr)
{
Tcl_HashEntry *hPtr;
@@ -4886,7 +4887,7 @@ TkMacOSXIsWindowZoomed(
int
TkMacOSXZoomToplevel(
- WindowRef whichWindow, /* The Macintosh window to zoom. */
+ void *whichWindow, /* The Macintosh window to zoom. */
short zoomPart) /* Either inZoomIn or inZoomOut */
{
Window window;
@@ -5428,7 +5429,7 @@ TkMacOSXMakeRealWindowExist(
void
TkMacOSXRegisterOffScreenWindow(
Window window, /* Window structure. */
- GWorldPtr portPtr) /* Pointer to a Mac GWorld. */
+ void *portPtr) /* Pointer to a Mac GWorld. */
{
Tcl_HashEntry *valueHashPtr;
int isNew;
@@ -5463,7 +5464,7 @@ TkMacOSXRegisterOffScreenWindow(
void
TkMacOSXUnregisterMacWindow(
- WindowRef macWinPtr) /* Reference to a Mac Window */
+ void *macWinPtr) /* Reference to a Mac Window */
{
Tcl_HashEntry *entryPtr;
@@ -5651,7 +5652,7 @@ TkpWmSetState(
int
TkpIsWindowFloating(
- WindowRef wRef)
+ void *wRef)
{
WindowClass class;
@@ -5706,7 +5707,7 @@ TkMacOSXWindowClass(
void
TkMacOSXWindowOffset(
- WindowRef wRef,
+ void *wRef,
int *xOffset,
int *yOffset)
{