summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog42
-rw-r--r--macosx/tkMacOSX.h5
-rw-r--r--macosx/tkMacOSXBitmap.c12
-rw-r--r--macosx/tkMacOSXButton.c10
-rw-r--r--macosx/tkMacOSXCarbonEvents.c3
-rw-r--r--macosx/tkMacOSXClipboard.c6
-rw-r--r--macosx/tkMacOSXColor.c5
-rw-r--r--macosx/tkMacOSXConfig.c3
-rw-r--r--macosx/tkMacOSXCursor.c6
-rw-r--r--macosx/tkMacOSXDialog.c5
-rw-r--r--macosx/tkMacOSXDraw.c104
-rw-r--r--macosx/tkMacOSXEmbed.c9
-rw-r--r--macosx/tkMacOSXEntry.c4
-rw-r--r--macosx/tkMacOSXEvent.c4
-rw-r--r--macosx/tkMacOSXEvent.h7
-rw-r--r--macosx/tkMacOSXFont.c11
-rw-r--r--macosx/tkMacOSXFont.h31
-rw-r--r--macosx/tkMacOSXHLEvents.c5
-rw-r--r--macosx/tkMacOSXInit.c5
-rw-r--r--macosx/tkMacOSXInt.h12
-rw-r--r--macosx/tkMacOSXKeyEvent.c3
-rw-r--r--macosx/tkMacOSXKeyboard.c6
-rw-r--r--macosx/tkMacOSXMenu.c10
-rw-r--r--macosx/tkMacOSXMenubutton.c9
-rw-r--r--macosx/tkMacOSXMenus.c11
-rw-r--r--macosx/tkMacOSXMouseEvent.c8
-rw-r--r--macosx/tkMacOSXNotify.c4
-rw-r--r--macosx/tkMacOSXRegion.c11
-rw-r--r--macosx/tkMacOSXScale.c6
-rw-r--r--macosx/tkMacOSXScrlbr.c9
-rw-r--r--macosx/tkMacOSXSend.c16
-rw-r--r--macosx/tkMacOSXSubwindows.c8
-rw-r--r--macosx/tkMacOSXTest.c8
-rw-r--r--macosx/tkMacOSXWindowEvent.c3
-rw-r--r--macosx/tkMacOSXWm.c5
-rw-r--r--macosx/tkMacOSXWm.h6
-rw-r--r--macosx/tkMacOSXXStubs.c14
37 files changed, 197 insertions, 229 deletions
diff --git a/ChangeLog b/ChangeLog
index d491ba4..f05bc3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2006-03-28 Daniel Steffen <das@users.sourceforge.net>
+
+ * generic/tkFont.h: added prototype for TkFontGetFirstTextLayout()
+ needed by tkMacOSXButton.c and tkMacOSXMenubutton.c.
+
+ * macosx/tkMacOSX.h: Cleaned up & rationalized order of
+ * macosx/tkMacOSXBitmap.c: #includes of tk and carbon headers;
+ * macosx/tkMacOSXButton.c: sync whitespace, comments & minor
+ * macosx/tkMacOSXCarbonEvents.c: changes with HEAD.
+ * macosx/tkMacOSXClipboard.c:
+ * macosx/tkMacOSXColor.c:
+ * macosx/tkMacOSXConfig.c:
+ * macosx/tkMacOSXCursor.c:
+ * macosx/tkMacOSXDialog.c:
+ * macosx/tkMacOSXDraw.c:
+ * macosx/tkMacOSXEmbed.c:
+ * macosx/tkMacOSXEntry.c:
+ * macosx/tkMacOSXEvent.c:
+ * macosx/tkMacOSXEvent.h:
+ * macosx/tkMacOSXFont.c:
+ * macosx/tkMacOSXFont.h (new file):
+ * macosx/tkMacOSXHLEvents.c:
+ * macosx/tkMacOSXInit.c:
+ * macosx/tkMacOSXInt.h:
+ * macosx/tkMacOSXKeyEvent.c:
+ * macosx/tkMacOSXKeyboard.c:
+ * macosx/tkMacOSXMenu.c:
+ * macosx/tkMacOSXMenubutton.c:
+ * macosx/tkMacOSXMenus.c:
+ * macosx/tkMacOSXMouseEvent.c:
+ * macosx/tkMacOSXNotify.c:
+ * macosx/tkMacOSXRegion.c:
+ * macosx/tkMacOSXScale.c:
+ * macosx/tkMacOSXScrlbr.c:
+ * macosx/tkMacOSXSend.c:
+ * macosx/tkMacOSXSubwindows.c:
+ * macosx/tkMacOSXTest.c:
+ * macosx/tkMacOSXWindowEvent.c:
+ * macosx/tkMacOSXWm.c:
+ * macosx/tkMacOSXWm.h:
+ * macosx/tkMacOSXXStubs.c:
+
2006-03-27 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* generic/tkImgGIF.c (FileReadGIF): Stop crashes when the first GIF
diff --git a/macosx/tkMacOSX.h b/macosx/tkMacOSX.h
index c0fbbc2..3f75f6f 100644
--- a/macosx/tkMacOSX.h
+++ b/macosx/tkMacOSX.h
@@ -9,17 +9,18 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSX.h,v 1.2.2.1 2005/02/24 00:41:08 das Exp $
+ * RCS: @(#) $Id: tkMacOSX.h,v 1.2.2.2 2006/03/28 02:44:12 das Exp $
*/
#ifndef _TKMAC
#define _TKMAC
-#include <Carbon/Carbon.h>
#ifndef _TK
#include "tk.h"
#endif
+#include <Carbon/Carbon.h>
+
/*
* Structures and function types for handling Netscape-type in process
* embedding where Tk does not control the top-level
diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index 186368c..eecb6f1 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -9,21 +9,11 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXBitmap.c,v 1.2.2.1 2005/05/14 20:53:31 das Exp $
+ * RCS: @(#) $Id: tkMacOSXBitmap.c,v 1.2.2.2 2006/03/28 02:44:12 das Exp $
*/
-#include "tkPort.h"
-#include "tk.h"
#include "tkMacOSXInt.h"
-#include <Carbon/Carbon.h>
-/*
-#include <Icons.h>
-#include <Dialogs.h>
-#include <Resources.h>
-#include <Strings.h>
-*/
-
/*
* Depending on the resource type there are different ways to
* draw native icons.
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index d5672cc..78fc303 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -10,11 +10,12 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXButton.c,v 1.2.2.12 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXButton.c,v 1.2.2.13 2006/03/28 02:44:12 das Exp $
*/
-#include "tkButton.h"
#include "tkMacOSXInt.h"
+#include "tkButton.h"
+#include "tkMacOSXFont.h"
#include "tkMacOSXDebug.h"
#define DEFAULT_USE_TK_TEXT 0
@@ -27,8 +28,6 @@
#define DEF_INSET_TOP 2
#define DEF_INSET_BOTTOM 4
-#include <Carbon/Carbon.h>
-
/*
* Some defines used to control what type of control is drawn.
*/
@@ -109,9 +108,6 @@ static void SetupBevelButton _ANSI_ARGS_((MacButton *butPtr,
ControlRef controlHandle,
GWorldPtr destPort, GC gc, Pixmap pixmap));
-extern int TkFontGetFirstTextLayout(Tk_TextLayout layout, Tk_Font * font, char * dst);
-extern void TkMacOSXInitControlFontStyle(Tk_Font tkfont,ControlFontStylePtr fsPtr);
-
/*
* The class procedure table for the button widgets.
*/
diff --git a/macosx/tkMacOSXCarbonEvents.c b/macosx/tkMacOSXCarbonEvents.c
index 6a8b5c7..81dc0a3 100644
--- a/macosx/tkMacOSXCarbonEvents.c
+++ b/macosx/tkMacOSXCarbonEvents.c
@@ -60,10 +60,9 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXCarbonEvents.c,v 1.3.2.10 2006/01/11 05:57:41 das Exp $
+ * RCS: @(#) $Id: tkMacOSXCarbonEvents.c,v 1.3.2.11 2006/03/28 02:44:13 das Exp $
*/
-#include "tkInt.h"
#include "tkMacOSXInt.h"
#include "tkMacOSXEvent.h"
#include "tkMacOSXDebug.h"
diff --git a/macosx/tkMacOSXClipboard.c b/macosx/tkMacOSXClipboard.c
index acfd94c..80d8e6c 100644
--- a/macosx/tkMacOSXClipboard.c
+++ b/macosx/tkMacOSXClipboard.c
@@ -9,17 +9,13 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXClipboard.c,v 1.2.2.3 2004/02/16 00:42:34 wolfsuit Exp $
+ * RCS: @(#) $Id: tkMacOSXClipboard.c,v 1.2.2.4 2006/03/28 02:44:13 das Exp $
*/
-#include "tkInt.h"
-#include "tkPort.h"
#include "tkMacOSXInt.h"
#include "tkSelect.h"
-#include <Carbon/Carbon.h>
-
/*
*----------------------------------------------------------------------
*
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index d634bdd..9207b03 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -12,12 +12,11 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXColor.c,v 1.2.2.1 2004/02/16 00:42:34 wolfsuit Exp $
+ * RCS: @(#) $Id: tkMacOSXColor.c,v 1.2.2.2 2006/03/28 02:44:13 das Exp $
*/
-#include <tkColor.h>
#include "tkMacOSXInt.h"
-#include <Carbon/Carbon.h>
+#include "tkColor.h"
/*
* Default Auxillary Control Record for all controls. This is cached once
diff --git a/macosx/tkMacOSXConfig.c b/macosx/tkMacOSXConfig.c
index a89d51f..8f4df57 100644
--- a/macosx/tkMacOSXConfig.c
+++ b/macosx/tkMacOSXConfig.c
@@ -10,10 +10,9 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXConfig.c,v 1.2 2002/08/31 06:12:29 das Exp $
+ * RCS: @(#) $Id: tkMacOSXConfig.c,v 1.2.2.1 2006/03/28 02:44:13 das Exp $
*/
-#include "tk.h"
#include "tkInt.h"
diff --git a/macosx/tkMacOSXCursor.c b/macosx/tkMacOSXCursor.c
index d023d4a..5d155b5 100644
--- a/macosx/tkMacOSXCursor.c
+++ b/macosx/tkMacOSXCursor.c
@@ -9,15 +9,11 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXCursor.c,v 1.4.2.2 2005/09/10 14:54:17 das Exp $
+ * RCS: @(#) $Id: tkMacOSXCursor.c,v 1.4.2.3 2006/03/28 02:44:13 das Exp $
*/
-#include "tkPort.h"
-#include "tkInt.h"
#include "tkMacOSXInt.h"
-#include <Carbon/Carbon.h>
-
/*
* There are three different ways to set the cursor on the Mac.
* The default theme cursors (listed in cursorNames below),
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index e2e609d..1f7100c 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -9,12 +9,9 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.4.2.9 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.4.2.10 2006/03/28 02:44:13 das Exp $
*/
-#include <Carbon/Carbon.h>
-#include "tkPort.h"
-#include "tkInt.h"
#include "tkMacOSXInt.h"
#include "tkFileFilter.h"
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index e382a48..917e3c7 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -11,26 +11,20 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXDraw.c,v 1.2.2.11 2006/03/02 20:44:25 hobbs Exp $
+ * RCS: @(#) $Id: tkMacOSXDraw.c,v 1.2.2.12 2006/03/28 02:44:13 das Exp $
*/
-#include "tkInt.h"
-#include "X11/X.h"
-#include "X11/Xlib.h"
-#include <stdio.h>
-
-#include <Carbon/Carbon.h>
#include "tkMacOSXInt.h"
-#include "tkPort.h"
#include "tkMacOSXDebug.h"
+
#include "tclInt.h" /* for Tcl_CreateNamespace() */
#ifndef PI
# define PI 3.14159265358979323846
#endif
-#define RGBFLOATRED(c) (float)((float)(c.red) / 65535.0f)
-#define RGBFLOATGREEN(c) (float)((float)(c.green) / 65535.0f)
-#define RGBFLOATBLUE(c) (float)((float)(c.blue) / 65535.0f)
+#define RGBFLOATRED(c) (float)((float)(c.red) / 65535.0f)
+#define RGBFLOATGREEN(c) (float)((float)(c.green) / 65535.0f)
+#define RGBFLOATBLUE(c) (float)((float)(c.blue) / 65535.0f)
/*
* Temporary regions that can be reused.
@@ -1725,15 +1719,15 @@ TkMacOSXSetUpGraphicsPort(
/*
*----------------------------------------------------------------------
*
- * TkMacOSXSetUpGraphicsPort --
+ * TkMacOSXSetUpCGContext --
*
- * Set up the graphics port from the given GC.
+ * Set up a CGContext for the given graphics port.
*
* Results:
* None.
*
* Side effects:
- * The current port is adjusted.
+ * None.
*
*----------------------------------------------------------------------
*/
@@ -1743,18 +1737,18 @@ TkMacOSXSetUpCGContext(
MacDrawable *macWin,
CGrafPtr destPort,
GC gc,
- CGContextRef *contextPtr) /* GC to apply to current port. */
+ CGContextRef *contextPtr)
{
RGBColor macColor;
CGContextRef outContext;
OSStatus err;
Rect boundsRect;
- CGAffineTransform coordsTransform;
+ CGAffineTransform coordsTransform;
static RgnHandle clipRgn = NULL;
err = QDBeginCGContext(destPort, contextPtr);
outContext = *contextPtr;
-
+
/*
* Now clip the CG Context to the port. Note, we have already
* set up the port with our clip region, so we can just get
@@ -1764,39 +1758,43 @@ TkMacOSXSetUpCGContext(
* We also have to intersect our clip region with the port
* visible region so we don't overwrite the window decoration.
*/
-
+
if (!clipRgn) {
- clipRgn = NewRgn();
+ clipRgn = NewRgn();
}
GetPortBounds(destPort, &boundsRect);
-
+
RectRgn(clipRgn, &boundsRect);
SectRegionWithPortClipRegion(destPort, clipRgn);
SectRegionWithPortVisibleRegion(destPort, clipRgn);
ClipCGContextToRegion(outContext, &boundsRect, clipRgn);
SetEmptyRgn(clipRgn);
-
+
/*
* Note: You have to call SyncCGContextOriginWithPort
* AFTER all the clip region manipulations.
*/
-
+
SyncCGContextOriginWithPort(outContext, destPort);
- coordsTransform = CGAffineTransformMake(1.0f, 0.0f, 0.0f, -1.0f, 0.0f,
- (float) (boundsRect.bottom - boundsRect.top));
+ coordsTransform = CGAffineTransformMake(1.0f, 0.0f, 0.0f, -1.0f, 0.0f,
+ (float) (boundsRect.bottom - boundsRect.top));
CGContextConcatCTM(outContext, coordsTransform);
/* Now offset the CTM to the subwindow offset */
- if (TkSetMacColor(gc->foreground, &macColor) == true) {
- CGContextSetRGBFillColor(outContext, RGBFLOATRED(macColor),
- RGBFLOATGREEN(macColor),
- RGBFLOATBLUE(macColor), 1.0f);
- CGContextSetRGBStrokeColor(outContext, RGBFLOATRED(macColor),
- RGBFLOATGREEN(macColor),
- RGBFLOATBLUE(macColor), 1.0f);
+ if (TkSetMacColor(gc->foreground, &macColor) == true) {
+ CGContextSetRGBFillColor(outContext,
+ RGBFLOATRED(macColor),
+ RGBFLOATGREEN(macColor),
+ RGBFLOATBLUE(macColor),
+ 1.0f);
+ CGContextSetRGBStrokeColor(outContext,
+ RGBFLOATRED(macColor),
+ RGBFLOATGREEN(macColor),
+ RGBFLOATBLUE(macColor),
+ 1.0f);
}
if(gc->function == GXxor) {
@@ -1812,22 +1810,22 @@ TkMacOSXSetUpCGContext(
}
if (gc->line_style != LineSolid) {
- int num = 0;
- char *p = &(gc->dashes);
- float dashOffset = (float) gc->dash_offset;
- float lengths[10];
-
- while (p[num] != '\0') {
- lengths[num] = (float) (p[num]);
- num++;
- }
- CGContextSetLineDash(outContext, dashOffset, lengths, num);
+ int num = 0;
+ char *p = &(gc->dashes);
+ float dashOffset = (float) gc->dash_offset;
+ float lengths[10];
+
+ while (p[num] != '\0') {
+ lengths[num] = (float) (p[num]);
+ num++;
+ }
+ CGContextSetLineDash(outContext, dashOffset, lengths, num);
}
- if (gc->cap_style == CapButt) {
- /*
- * What about CapNotLast, CapProjecting?
- */
+ if (gc->cap_style == CapButt) {
+ /*
+ * What about CapNotLast, CapProjecting?
+ */
CGContextSetLineCap(outContext, kCGLineCapButt);
} else if (gc->cap_style == CapRound) {
@@ -1844,6 +1842,22 @@ TkMacOSXSetUpCGContext(
CGContextSetLineJoin(outContext, kCGLineJoinBevel);
}
}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkMacOSXReleaseCGContext --
+ *
+ * Release the CGContext for the given graphics port.
+ *
+ * Results:
+ * None.
+ *
+ * Side effects:
+ * None.
+ *
+ *----------------------------------------------------------------------
+ */
static void
TkMacOSXReleaseCGContext(
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index deed9e6..b759ffa 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -14,16 +14,9 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXEmbed.c,v 1.2.2.1 2005/08/09 07:39:54 das Exp $
+ * RCS: @(#) $Id: tkMacOSXEmbed.c,v 1.2.2.2 2006/03/28 02:44:13 das Exp $
*/
-#include "tkInt.h"
-#include "tkPort.h"
-#include "X11/X.h"
-#include "X11/Xlib.h"
-#include <stdio.h>
-
-#include <Carbon/Carbon.h>
#include "tkMacOSXInt.h"
/*
diff --git a/macosx/tkMacOSXEntry.c b/macosx/tkMacOSXEntry.c
index d8d0504..4da889f 100644
--- a/macosx/tkMacOSXEntry.c
+++ b/macosx/tkMacOSXEntry.c
@@ -50,11 +50,9 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXEntry.c,v 1.2.2.5 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXEntry.c,v 1.2.2.6 2006/03/28 02:44:13 das Exp $
*/
-#include "tk.h"
-#include "tkInt.h"
#include "tkMacOSXInt.h"
#include "tkMacOSXDefault.h"
#include "tkEntry.h"
diff --git a/macosx/tkMacOSXEvent.c b/macosx/tkMacOSXEvent.c
index 0f97852..09e7c7b 100644
--- a/macosx/tkMacOSXEvent.c
+++ b/macosx/tkMacOSXEvent.c
@@ -9,11 +9,9 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXEvent.c,v 1.3.2.4 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXEvent.c,v 1.3.2.5 2006/03/28 02:44:13 das Exp $
*/
-#include <stdio.h>
-
#include "tkMacOSXInt.h"
#include "tkMacOSXEvent.h"
#include "tkMacOSXDebug.h"
diff --git a/macosx/tkMacOSXEvent.h b/macosx/tkMacOSXEvent.h
index 2d09225..524d93e 100644
--- a/macosx/tkMacOSXEvent.h
+++ b/macosx/tkMacOSXEvent.h
@@ -50,14 +50,15 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXEvent.h,v 1.3.2.4 2005/11/30 20:17:32 hobbs Exp $
+ * RCS: @(#) $Id: tkMacOSXEvent.h,v 1.3.2.5 2006/03/28 02:44:13 das Exp $
*/
#ifndef _TKMACEVENT
#define _TKMACEVENT
-#include <Carbon/Carbon.h>
-#include <tcl.h>
+#ifndef _TK
+#include "tk.h"
+#endif
typedef struct {
int stopProcessing;
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index e27650e..45da327 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -1,4 +1,4 @@
-/*
+/*
* tkMacOSXFont.c --
*
* Contains the Macintosh implementation of the platform-independant
@@ -11,12 +11,12 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXFont.c,v 1.3.2.7 2006/01/10 05:38:20 das Exp $
+ * RCS: @(#) $Id: tkMacOSXFont.c,v 1.3.2.8 2006/03/28 02:44:13 das Exp $
*/
-#include <Carbon/Carbon.h>
#include "tkMacOSXInt.h"
-#include "tkFont.h"
+#include "tkMacOSXFont.h"
+
#include "tclInt.h" /* for Tcl_CreateNamespace() */
/*
@@ -254,9 +254,6 @@ static int GetFamilyOrAliasNum(CONST char *faceName, short *familyPtr);
static Tcl_Encoding GetFontEncoding(int faceNum, int allowSymbol, int *isSymbolPtr);
static Tk_Uid GetUtfFaceName(StringPtr faceNameStr);
-void TkMacOSXInitControlFontStyle(Tk_Font tkfont,
- ControlFontStylePtr fsPtr);
-
/*
*-------------------------------------------------------------------------
*
diff --git a/macosx/tkMacOSXFont.h b/macosx/tkMacOSXFont.h
new file mode 100644
index 0000000..aeba273
--- /dev/null
+++ b/macosx/tkMacOSXFont.h
@@ -0,0 +1,31 @@
+/*
+ * tkMacOSXFont.h --
+ *
+ * Contains the Macintosh implementation of the platform-independant
+ * font package interface.
+ *
+ * Copyright (c) 1990-1994 The Regents of the University of California.
+ * Copyright (c) 1994-1997 Sun Microsystems, Inc.
+ * Copyright 2001, Apple Computer, Inc.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS: @(#) $Id: tkMacOSXFont.h,v 1.3.2.2 2006/03/28 02:44:13 das Exp $
+ */
+
+#ifndef TKMACOSXFONT_H
+#define TKMACOSXFONT_H 1
+
+#include "tkFont.h"
+
+#include <Carbon/Carbon.h>
+
+/*
+ * Function prototypes
+ */
+
+extern void TkMacOSXInitControlFontStyle(Tk_Font tkfont,
+ ControlFontStylePtr fsPtr);
+
+#endif /*TKMACOSXFONT_H*/
diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index 424f62f..e1789f8 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -10,14 +10,11 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXHLEvents.c,v 1.5.2.6 2005/08/09 07:40:00 das Exp $
+ * RCS: @(#) $Id: tkMacOSXHLEvents.c,v 1.5.2.7 2006/03/28 02:44:13 das Exp $
*/
-#include "tkMacOSXPort.h"
#include "tkMacOSXInt.h"
-#include <Carbon/Carbon.h>
-
/*
* This is a Tcl_Event structure that the Quit AppleEvent handler
* uses to schedule the tkReallyKillMe function.
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index d0f5a5a..d790893 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -10,12 +10,13 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXInit.c,v 1.3.2.13 2006/01/10 05:38:20 das Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.3.2.14 2006/03/28 02:44:13 das Exp $
*/
-#include "tkInt.h"
#include "tkMacOSXInt.h"
+
#include "tclInt.h" /* for TclGetStartupScript() & TclSetStartupScript() */
+
#include <sys/stat.h>
#include <mach-o/dyld.h>
#include <mach-o/getsect.h>
diff --git a/macosx/tkMacOSXInt.h b/macosx/tkMacOSXInt.h
index 236cec6..4118fb7 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.8 2005/12/08 05:04:35 das Exp $
+ * RCS: @(#) $Id: tkMacOSXInt.h,v 1.3.2.9 2006/03/28 02:44:13 das Exp $
*/
#ifndef _TKMACINT
@@ -19,6 +19,10 @@
#include "tkInt.h"
#endif
+#define TextStyle MacTextStyle
+#include <Carbon/Carbon.h>
+#undef TextStyle
+
/*
* Include platform specific public interfaces.
*/
@@ -27,12 +31,6 @@
#include "tkMacOSX.h"
#endif
-#ifndef _TKPORT
-#include "tkPort.h"
-#endif
-
-#include <Carbon/Carbon.h>
-
struct TkWindowPrivate {
TkWindow *winPtr; /* Ptr to tk window or NULL if Pixmap */
CGrafPtr grafPtr;
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 1da09ba..f45da28 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -50,11 +50,10 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXKeyEvent.c,v 1.6.2.6 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXKeyEvent.c,v 1.6.2.7 2006/03/28 02:44:13 das Exp $
*/
#include "tkMacOSXInt.h"
-#include "tkPort.h"
#include "tkMacOSXEvent.h"
typedef struct {
diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c
index 5312127..2a377ae 100644
--- a/macosx/tkMacOSXKeyboard.c
+++ b/macosx/tkMacOSXKeyboard.c
@@ -9,13 +9,9 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXKeyboard.c,v 1.5.2.4 2005/05/14 20:53:31 das Exp $
+ * RCS: @(#) $Id: tkMacOSXKeyboard.c,v 1.5.2.5 2006/03/28 02:44:13 das Exp $
*/
-#include "tkInt.h"
-#include "X11/Xlib.h"
-#include "X11/keysym.h"
-#include <Carbon/Carbon.h>
#include "tkMacOSXInt.h"
#include "tkMacOSXEvent.h" /* TkMacOSXKeycodeToUnicode() FIXME: That
* function should probably move here. */
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index a35b00b..b871c4a 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -9,22 +9,18 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.6.2.16 2006/01/11 05:57:41 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.6.2.17 2006/03/28 02:44:13 das Exp $
*/
+
#include "tkMacOSXInt.h"
#include "tkMenubutton.h"
#include "tkMenu.h"
#include "tkColor.h"
-#include "tkMacOSXInt.h"
-#undef Status
+#include "tkMacOSXDebug.h"
#define USE_TK_MDEF
//#define USE_ATSU
-#include <Carbon/Carbon.h>
-#include "tkMacOSXDebug.h"
-#include <CoreFoundation/CFString.h>
-
/*
#ifdef TK_MAC_DEBUG
#define TK_MAC_DEBUG_MENUS
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index 91460a8..50c9591 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -10,13 +10,13 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.2.2.6 2005/11/27 06:47:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.2.2.7 2006/03/28 02:44:13 das Exp $
*/
-#include <Carbon/Carbon.h>
+#include "tkMacOSXInt.h"
#include "tkMenu.h"
#include "tkMenubutton.h"
-#include "tkMacOSXInt.h"
+#include "tkMacOSXFont.h"
#include "tkMacOSXDebug.h"
#if !defined(MAC_OS_X_VERSION_10_3) || \
@@ -90,9 +90,6 @@ static void CompareControlTitleParams(
int * styleChanged
);
-extern int TkFontGetFirstTextLayout(Tk_TextLayout layout, Tk_Font * font, char * dst);
-extern void TkMacOSXInitControlFontStyle(Tk_Font tkfont,ControlFontStylePtr fsPtr);
-
/*
* The structure below defines menubutton class behavior by means of
* procedures that can be invoked from generic window code.
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index c214105..69151f1 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -10,20 +10,11 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.2.2.6 2005/11/27 06:53:36 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.2.2.7 2006/03/28 02:44:13 das Exp $
*/
-#include "tk.h"
-#include "tkInt.h"
#include "tkMacOSXInt.h"
-/*
- * The define Status defined by Xlib.h conflicts with the function Status
- * defined by Devices.h. We undefine it here to compile.
- */
-#undef Status
-#include <Carbon/Carbon.h>
-
#if !defined(MAC_OS_X_VERSION_10_3) || \
(MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
/* Define constants only available on Mac OS X 10.3 or later */
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 9375118..da0c546 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -54,15 +54,11 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXMouseEvent.c,v 1.6.2.10 2005/12/13 03:44:42 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMouseEvent.c,v 1.6.2.11 2006/03/28 02:44:13 das Exp $
*/
-#include "tkInt.h"
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include "tkMacOSXEvent.h"
#include "tkMacOSXInt.h"
-#include "tkPort.h"
+#include "tkMacOSXEvent.h"
#include "tkMacOSXDebug.h"
#if !defined(MAC_OS_X_VERSION_10_3) || \
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index b6a711b..7d0266b 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -12,10 +12,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXNotify.c,v 1.5.2.8 2005/12/08 07:50:30 das Exp $
+ * RCS: @(#) $Id: tkMacOSXNotify.c,v 1.5.2.9 2006/03/28 02:44:13 das Exp $
*/
-#include "tkInt.h"
+#include "tkMacOSXInt.h"
#include "tkMacOSXEvent.h"
#include <pthread.h>
diff --git a/macosx/tkMacOSXRegion.c b/macosx/tkMacOSXRegion.c
index 12270f5..803d144 100644
--- a/macosx/tkMacOSXRegion.c
+++ b/macosx/tkMacOSXRegion.c
@@ -9,19 +9,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXRegion.c,v 1.2.2.1 2004/11/11 01:26:43 das Exp $
+ * RCS: @(#) $Id: tkMacOSXRegion.c,v 1.2.2.2 2006/03/28 02:44:14 das Exp $
*/
-#include "tkInt.h"
#include "tkMacOSXInt.h"
-#include "X11/X.h"
-#include "X11/Xlib.h"
-
-#include <Carbon/Carbon.h>
-/*
-#include <Windows.h>
-#include <QDOffscreen.h>
-*/
/*
* Temporary region that can be reused.
diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c
index 7a5c4a2..5c32969 100644
--- a/macosx/tkMacOSXScale.c
+++ b/macosx/tkMacOSXScale.c
@@ -10,13 +10,11 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXScale.c,v 1.2.2.3 2005/09/10 14:54:18 das Exp $
+ * RCS: @(#) $Id: tkMacOSXScale.c,v 1.2.2.4 2006/03/28 02:44:14 das Exp $
*/
-#include "tkScale.h"
-#include "tkInt.h"
-#include <Carbon/Carbon.h>
#include "tkMacOSXInt.h"
+#include "tkScale.h"
/*
* Defines used in this file.
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 0f91662..ec7bed7 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -11,16 +11,15 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.5.2.7 2005/12/08 07:50:30 das Exp $
+ * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.5.2.8 2006/03/28 02:44:14 das Exp $
*/
-#include "tkScrollbar.h"
#include "tkMacOSXInt.h"
-#include "tclInt.h" /* for TclServiceIdle() */
+#include "tkScrollbar.h"
+#include "tkMacOSXDebug.h"
-#include <Carbon/Carbon.h>
+#include "tclInt.h" /* for TclServiceIdle() */
-#include "tkMacOSXDebug.h"
/*
* The following definitions should really be in MacOS
* header files. They are included here as this is the only
diff --git a/macosx/tkMacOSXSend.c b/macosx/tkMacOSXSend.c
index 1647f75..2159619 100644
--- a/macosx/tkMacOSXSend.c
+++ b/macosx/tkMacOSXSend.c
@@ -32,15 +32,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXSend.c,v 1.2 2002/08/31 06:12:30 das Exp $
+ * RCS: @(#) $Id: tkMacOSXSend.c,v 1.2.2.1 2006/03/28 02:44:14 das Exp $
*/
-#include <Carbon/Carbon.h>
-/*
-#include <Gestalt.h>
-*/
-#include "tkPort.h"
-#include "tkInt.h"
+#include "tkMacOSXInt.h"
EXTERN int Tk_SendObjCmd _ANSI_ARGS_((ClientData clientData,
Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
@@ -174,13 +169,6 @@ static RegisteredInterp *interpListPtr = NULL;
*/
/*
- * The following variable is the serial number that was used in the
- * last "send" command. It is exported only for testing purposes.
- */
-
-int tkSendSerial = 0;
-
- /*
* Maximum size property that can be read at one time by
* this module:
*/
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index d587a1a..6d85a6f 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -9,15 +9,9 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.2.2.8 2006/02/09 19:09:43 das Exp $
+ * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.2.2.9 2006/03/28 02:44:14 das Exp $
*/
-#include "tkInt.h"
-#include "X11/X.h"
-#include "X11/Xlib.h"
-#include <stdio.h>
-
-#include <Carbon/Carbon.h>
#include "tkMacOSXInt.h"
#include "tkMacOSXDebug.h"
#include "tkMacOSXWm.h"
diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index 8195cd8..02b7a61 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXTest.c,v 1.2.2.2 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXTest.c,v 1.2.2.3 2006/03/28 02:44:14 das Exp $
*/
#include "tkMacOSXInt.h"
@@ -19,9 +19,9 @@
* Forward declarations of procedures defined later in this file:
*/
-int TkplatformtestInit _ANSI_ARGS_((Tcl_Interp *interp));
-static int DebuggerCmd _ANSI_ARGS_((ClientData dummy,
- Tcl_Interp *interp, int argc, CONST char **argv));
+static int DebuggerCmd (ClientData dummy, Tcl_Interp *interp,
+ int argc, CONST char **argv);
+int TkplatformtestInit (Tcl_Interp *interp);
/*
*----------------------------------------------------------------------
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 7652376..1a18b33 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -54,11 +54,10 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.3.2.8 2006/02/09 19:09:43 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.3.2.9 2006/03/28 02:44:14 das Exp $
*/
#include "tkMacOSXInt.h"
-#include "tkPort.h"
#include "tkMacOSXWm.h"
#include "tkMacOSXEvent.h"
#include "tkMacOSXDebug.h"
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index ba5abec..d716f92 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -12,12 +12,9 @@
* 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.7.2.17 2006/03/13 18:19:00 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.7.2.18 2006/03/28 02:44:14 das Exp $
*/
-#include <Carbon/Carbon.h>
-#include "tkPort.h"
-#include "tkInt.h"
#include "tkMacOSXInt.h"
#include "tkScrollbar.h"
#include "tkMacOSXWm.h"
diff --git a/macosx/tkMacOSXWm.h b/macosx/tkMacOSXWm.h
index 3753098..037ccdc 100644
--- a/macosx/tkMacOSXWm.h
+++ b/macosx/tkMacOSXWm.h
@@ -50,17 +50,13 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXWm.h,v 1.2.2.3 2006/03/13 18:19:01 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.h,v 1.2.2.4 2006/03/28 02:44:14 das Exp $
*/
#ifndef _TKMACWM
#define _TKMACWM
-#include <Carbon/Carbon.h>
-#include "tkPort.h"
-#include "tkInt.h"
#include "tkMacOSXInt.h"
-#include "tkScrollbar.h"
/*
* A data structure of the following type holds information for
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index b776ae0..31d969e 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -12,22 +12,10 @@
* 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.11 2005/12/08 05:04:35 das Exp $
+ * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.2.2.12 2006/03/28 02:44:14 das Exp $
*/
-#include "tkInt.h"
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include <sys/types.h>
-
-#include <X11/Xatom.h>
-
-#include <Carbon/Carbon.h>
#include "tkMacOSXInt.h"
-#include "tkPort.h"
#include "tkMacOSXEvent.h"
/*