summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXInt.h40
-rw-r--r--macosx/tkMacOSXWindowEvent.c16
-rw-r--r--macosx/tkMacOSXXStubs.c8
3 files changed, 33 insertions, 31 deletions
diff --git a/macosx/tkMacOSXInt.h b/macosx/tkMacOSXInt.h
index a6c90f8..236cec6 100644
--- a/macosx/tkMacOSXInt.h
+++ b/macosx/tkMacOSXInt.h
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXInt.h,v 1.3.2.7 2005/11/30 01:02:55 hobbs Exp $
+ * RCS: @(#) $Id: tkMacOSXInt.h,v 1.3.2.8 2005/12/08 05:04:35 das Exp $
*/
#ifndef _TKMACINT
@@ -73,9 +73,10 @@ typedef struct TkMacOSXWindowList {
/*
* I am reserving TK_EMBEDDED = 0x100 in the MacDrawable flags
* This is defined in tk.h. We need to duplicate the TK_EMBEDDED flag in the
- * TkWindow structure for the window, but in the MacWin. This way we can still tell
- * what the correct port is after the TKWindow structure has been freed. This
- * actually happens when you bind destroy of a toplevel to Destroy of a child.
+ * TkWindow structure for the window, but in the MacWin. This way we can
+ * still tell what the correct port is after the TKWindow structure has been
+ * freed. This actually happens when you bind destroy of a toplevel to
+ * Destroy of a child.
*/
/*
@@ -106,14 +107,14 @@ extern TkMacOSXEmbedHandler *gMacEmbedHandler;
/*
* Accessor for the privatePtr flags field for the TK_HOST_EXISTS field
*/
-
+
#define TkMacOSXHostToplevelExists(tkwin) \
(((TkWindow *) (tkwin))->privatePtr->toplevel->flags & TK_HOST_EXISTS)
/*
* Defines use for the flags argument to TkGenWMConfigureEvent.
*/
-
+
#define TK_LOCATION_CHANGED 1
#define TK_SIZE_CHANGED 2
#define TK_BOTH_CHANGED 3
@@ -122,11 +123,11 @@ extern TkMacOSXEmbedHandler *gMacEmbedHandler;
* Variables shared among various Mac Tk modules but are not
* exported to the outside world.
*/
-
+
/*
* Globals shared among Macintosh Tk
*/
-
+
extern MenuHandle tkAppleMenu; /* Handle to the Apple Menu */
extern MenuHandle tkFileMenu; /* Handles to menus */
extern MenuHandle tkEditMenu; /* Handles to menus */
@@ -137,20 +138,23 @@ extern int tkUseMenuCascadeRgn; /* If this is 1, clipping code
* tkMenuCascadeRgn will only
* be valid when the value of this
* variable is 1. */
-extern int tkPictureIsOpen; /* If this is 1, we are drawing to a picture
- * The clipping should then be done relative
- * to the bounds of the picture rather than
- * the window As of OS X.0.4, something is
- * seriously wrong: The clipping bounds only
- * seem to work if the top,left values are 0,0
- * The destination rectangle for CopyBits
- * should also have top,left values of 0,0
- */
+extern int tkPictureIsOpen; /* If this is 1, we are drawing to a
+ * picture The clipping should then be
+ * done relative to the bounds of the
+ * picture rather than the window. As
+ * of OS X.0.4, something is seriously
+ * wrong: The clipping bounds only
+ * seem to work if the top,left values
+ * are 0,0 The destination rectangle
+ * for CopyBits should also have
+ * top,left values of 0,0
+ */
extern TkMacOSXWindowList *tkMacOSXWindowListPtr;
/* The list of toplevels */
extern Tcl_Encoding TkMacOSXCarbonEncoding;
+extern void TkMacOSXDisplayChanged(Display *display);
extern int TkMacOSXUseAntialiasedText(Tcl_Interp *interp, int enable);
extern void TkMacOSXInitCarbonEvents(Tcl_Interp *interp);
extern int TkMacOSXInitCGDrawing(Tcl_Interp *interp, int enable, int antiAlias);
@@ -166,8 +170,6 @@ extern void* TkMacOSXGetNamedSymbol(const char* module, const char* symbol);
symbol = TkMacOSXGetNamedSymbol(STRINGIFY(module), STRINGIFY(_##symbol));\
}
-extern void TkMacOSXDisplayChanged(Display *display);
-
#include "tkIntPlatDecls.h"
#endif /* _TKMACINT */
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index b6c039a..9f82532 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -54,7 +54,7 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.3.2.6 2005/11/30 01:02:55 hobbs Exp $
+ * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.3.2.7 2005/12/08 05:04:35 das Exp $
*/
#include "tkMacOSXInt.h"
@@ -129,10 +129,10 @@ TkMacOSXProcessApplicationEvent(
statusPtr->stopProcessing = 1;
break;
case kEventAppHidden:
- /*
- * Don't bother if we don't have an interp or
- * the show preferences procedure doesn't exist.
- */
+ /*
+ * Don't bother if we don't have an interp or
+ * the show preferences procedure doesn't exist.
+ */
toggleHide = 1;
if ((eventPtr->interp == NULL) ||
(Tcl_GetCommandInfo(eventPtr->interp,
@@ -247,11 +247,11 @@ TkMacOSXProcessWindowEvent(
return 0;
}
-/*
+/*
*----------------------------------------------------------------------
- *
+ *
* GenerateUpdateEvent --
- *
+ *
* Given a Macintosh window update event this function generates all the
* X update events needed by Tk.
*
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index 592c760..b776ae0 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.2.2.10 2005/11/30 01:02:55 hobbs Exp $
+ * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.2.2.11 2005/12/08 05:04:35 das Exp $
*/
#include "tkInt.h"
@@ -854,11 +854,11 @@ TkMacOSXXPutPixel(
b = (pixel & image->blue_mask);
if (image->obdata) {
/* Image from XGetImage, 16 bit color values */
- cPix . red = r << 8;
+ cPix . red = r << 8;
cPix . green = g << 8;
cPix . blue = b << 8;
} else {
- cPix . red = r;
+ cPix . red = r;
cPix . green = g;
cPix . blue = b;
}
@@ -965,7 +965,7 @@ XSetWindowColormap(
Debugger();
}
-Status
+Status
XStringListToTextProperty(
char** list,
int count,