summaryrefslogtreecommitdiffstats
path: root/mac
diff options
context:
space:
mode:
Diffstat (limited to 'mac')
-rw-r--r--mac/tkMac.h32
-rw-r--r--mac/tkMacAppInit.c3
-rw-r--r--mac/tkMacCursor.c5
-rw-r--r--mac/tkMacInt.h83
-rw-r--r--mac/tkMacPort.h3
-rw-r--r--mac/tkMacXStubs.c32
6 files changed, 41 insertions, 117 deletions
diff --git a/mac/tkMac.h b/mac/tkMac.h
index 45eafdc..4c3d362 100644
--- a/mac/tkMac.h
+++ b/mac/tkMac.h
@@ -1,5 +1,5 @@
/*
- * tkMacInt.h --
+ * Tkmacint.h --
*
* Declarations of Macintosh specific exported variables and procedures.
*
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMac.h,v 1.4 1998/09/14 18:23:34 stanton Exp $
+ * RCS: @(#) $Id: tkMac.h,v 1.5 1999/03/10 07:04:44 stanton Exp $
*/
#ifndef _TKMAC
@@ -48,33 +48,7 @@ typedef void (Tk_MacEmbedGetOffsetInParentProc) (Tk_Window window, Point *ulCorn
* Mac Specific functions that are available to extension writers.
*/
-EXTERN void Tk_MacSetEmbedHandler _ANSI_ARGS_((
- Tk_MacEmbedRegisterWinProc *registerWinProcPtr,
- Tk_MacEmbedGetGrafPortProc *getPortProcPtr,
- Tk_MacEmbedMakeContainerExistProc *containerExistProcPtr,
- Tk_MacEmbedGetClipProc *getClipProc,
- Tk_MacEmbedGetOffsetInParentProc *getOffsetProc));
-
-
-EXTERN void Tk_MacTurnOffMenus _ANSI_ARGS_ (());
-EXTERN void Tk_MacTkOwnsCursor _ANSI_ARGS_ ((int tkOwnsIt));
-
-/*
- * These functions are currently in tkMacInt.h. They are just copied over here
- * so they can be exported.
- */
-
-EXTERN void TkMacInitMenus _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN void TkMacInitAppleEvents _ANSI_ARGS_((Tcl_Interp *interp));
-
-EXTERN int TkMacConvertEvent _ANSI_ARGS_((EventRecord *eventPtr));
-EXTERN int TkMacConvertTkEvent _ANSI_ARGS_((EventRecord *eventPtr,
- Window window));
-EXTERN void TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin,
- int x, int y, int width, int height, int flags));
-EXTERN void TkMacInvalClipRgns _ANSI_ARGS_((TkWindow *winPtr));
-EXTERN int TkMacHaveAppearance _ANSI_ARGS_((void));
-EXTERN GWorldPtr TkMacGetDrawablePort _ANSI_ARGS_((Drawable drawable));
+#include "tkPlatDecls.h"
#pragma export reset
diff --git a/mac/tkMacAppInit.c b/mac/tkMacAppInit.c
index 5b73a65..b749454 100644
--- a/mac/tkMacAppInit.c
+++ b/mac/tkMacAppInit.c
@@ -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: tkMacAppInit.c,v 1.5 1999/02/04 20:57:18 stanton Exp $
+ * RCS: @(#) $Id: tkMacAppInit.c,v 1.6 1999/03/10 07:04:44 stanton Exp $
*/
#include <Gestalt.h>
@@ -274,7 +274,6 @@ MacintoshInit()
Tcl_MacSetEventProc(TkMacConvertEvent);
- TkConsoleCreate();
return TCL_OK;
}
diff --git a/mac/tkMacCursor.c b/mac/tkMacCursor.c
index 4b8a454..604e8f0 100644
--- a/mac/tkMacCursor.c
+++ b/mac/tkMacCursor.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacCursor.c,v 1.3 1998/09/14 18:23:34 stanton Exp $
+ * RCS: @(#) $Id: tkMacCursor.c,v 1.4 1999/03/10 07:04:44 stanton Exp $
*/
#include "tkPort.h"
@@ -385,7 +385,8 @@ TkpSetCursor(
*----------------------------------------------------------------------
*/
-void Tk_MacTkOwnsCursor(
+void
+Tk_MacTkOwnsCursor(
int tkOwnsIt)
{
gTkOwnsCursor = tkOwnsIt;
diff --git a/mac/tkMacInt.h b/mac/tkMacInt.h
index 04b132b..1a8f1fc 100644
--- a/mac/tkMacInt.h
+++ b/mac/tkMacInt.h
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacInt.h,v 1.5 1998/09/30 19:01:21 rjohnson Exp $
+ * RCS: @(#) $Id: tkMacInt.h,v 1.6 1999/03/10 07:04:44 stanton Exp $
*/
#ifndef _TKMACINT
@@ -212,85 +212,6 @@ typedef TkMenuDefProcPtr TkMenuDefUPP;
* Internal procedures shared among Macintosh Tk modules but not exported
* to the outside world:
*/
-
-extern int HandleWMEvent _ANSI_ARGS_((EventRecord *theEvent));
-extern void TkAboutDlg _ANSI_ARGS_((void));
-extern void TkCreateMacEventSource _ANSI_ARGS_((void));
-extern void TkFontList _ANSI_ARGS_((Tcl_Interp *interp,
- Display *display));
-extern Window TkGetTransientMaster _ANSI_ARGS_((TkWindow *winPtr));
-extern int TkGenerateButtonEvent _ANSI_ARGS_((int x, int y,
- Window window, unsigned int state));
-extern int TkGetCharPositions _ANSI_ARGS_((
- XFontStruct *font_struct, char *string,
- int count, short *buffer));
-extern void TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin));
-extern void TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin,
- int x, int y, int width, int height, int flags));
-extern unsigned int TkMacButtonKeyState _ANSI_ARGS_((void));
-extern void TkMacClearMenubarActive _ANSI_ARGS_((void));
-extern int TkMacConvertEvent _ANSI_ARGS_((EventRecord *eventPtr));
-extern int TkMacDispatchMenuEvent _ANSI_ARGS_((int menuID,
- int index));
-extern void TkMacInstallCursor _ANSI_ARGS_((int resizeOverride));
-extern int TkMacConvertTkEvent _ANSI_ARGS_((EventRecord *eventPtr,
- Window window));
-extern void TkMacHandleTearoffMenu _ANSI_ARGS_((void));
-extern void tkMacInstallMWConsole _ANSI_ARGS_((
- Tcl_Interp *interp));
-extern void TkMacInvalClipRgns _ANSI_ARGS_((TkWindow *winPtr));
-extern void TkMacDoHLEvent _ANSI_ARGS_((EventRecord *theEvent));
-extern void TkMacFontInfo _ANSI_ARGS_((Font fontId, short *family,
- short *style, short *size));
-extern Time TkMacGenerateTime _ANSI_ARGS_(());
-extern GWorldPtr TkMacGetDrawablePort _ANSI_ARGS_((Drawable drawable));
-extern TkWindow * TkMacGetScrollbarGrowWindow _ANSI_ARGS_((
- TkWindow *winPtr));
-extern Window TkMacGetXWindow _ANSI_ARGS_((WindowRef macWinPtr));
-extern int TkMacGrowToplevel _ANSI_ARGS_((WindowRef whichWindow,
- Point start));
-extern void TkMacHandleMenuSelect _ANSI_ARGS_((long mResult,
- int optionKeyPressed));
-extern int TkMacHaveAppearance _ANSI_ARGS_((void));
-extern void TkMacInitAppleEvents _ANSI_ARGS_((Tcl_Interp *interp));
-extern void TkMacInitMenus _ANSI_ARGS_((Tcl_Interp *interp));
-extern void TkMacInvalidateWindow _ANSI_ARGS_((MacDrawable *macWin, int flag));
-extern int TkMacIsCharacterMissing _ANSI_ARGS_((Tk_Font tkfont,
- unsigned int searchChar));
-extern void TkMacMakeRealWindowExist _ANSI_ARGS_((
- TkWindow *winPtr));
-extern BitMapPtr TkMacMakeStippleMap(Drawable, Drawable);
-extern void TkMacMenuClick _ANSI_ARGS_((void));
-extern void TkMacRegisterOffScreenWindow _ANSI_ARGS_((Window window,
- GWorldPtr portPtr));
-extern int TkMacResizable _ANSI_ARGS_((TkWindow *winPtr));
-extern void TkMacSetEmbedRgn _ANSI_ARGS_((TkWindow *winPtr, RgnHandle rgn));
-extern void TkMacSetHelpMenuItemCount _ANSI_ARGS_((void));
-extern void TkMacSetScrollbarGrow _ANSI_ARGS_((TkWindow *winPtr,
- int flag));
-extern void TkMacSetUpClippingRgn _ANSI_ARGS_((Drawable drawable));
-extern void TkMacSetUpGraphicsPort _ANSI_ARGS_((GC gc));
-extern void TkMacUpdateClipRgn _ANSI_ARGS_((TkWindow *winPtr));
-extern void TkMacUnregisterMacWindow _ANSI_ARGS_((GWorldPtr portPtr));
-extern int TkMacUseMenuID _ANSI_ARGS_((short macID));
-extern RgnHandle TkMacVisableClipRgn _ANSI_ARGS_((TkWindow *winPtr));
-extern void TkMacWinBounds _ANSI_ARGS_((TkWindow *winPtr,
- Rect *geometry));
-extern void TkMacWindowOffset _ANSI_ARGS_((WindowRef wRef,
- int *xOffset, int *yOffset));
-extern void TkResumeClipboard _ANSI_ARGS_((void));
-extern int TkSetMacColor _ANSI_ARGS_((unsigned long pixel,
- RGBColor *macColor));
-extern void TkSetWMName _ANSI_ARGS_((TkWindow *winPtr,
- Tk_Uid titleUid));
-extern void TkSuspendClipboard _ANSI_ARGS_((void));
-extern int TkWMGrowToplevel _ANSI_ARGS_((WindowRef whichWindow,
- Point start));
-extern int TkMacZoomToplevel _ANSI_ARGS_((WindowPtr whichWindow,
- Point where, short zoomPart));
-extern Tk_Window Tk_TopCoordsToWindow _ANSI_ARGS_((Tk_Window tkwin,
- int rootX, int rootY, int *newX, int *newY));
-extern MacDrawable * TkMacContainerId _ANSI_ARGS_((TkWindow *winPtr));
-extern MacDrawable * TkMacGetHostToplevel _ANSI_ARGS_((TkWindow *winPtr));
+#include "tkIntPlatDecls.h"
#endif /* _TKMACINT */
diff --git a/mac/tkMacPort.h b/mac/tkMacPort.h
index 6175364..76a61b4 100644
--- a/mac/tkMacPort.h
+++ b/mac/tkMacPort.h
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacPort.h,v 1.4 1998/11/11 17:31:29 jingham Exp $
+ * RCS: @(#) $Id: tkMacPort.h,v 1.5 1999/03/10 07:04:44 stanton Exp $
*/
#ifndef _TKMACPORT
@@ -99,7 +99,6 @@ extern int strncasecmp _ANSI_ARGS_((CONST char *s1,
#define TkpCmapStressed(tkwin,colormap) (0)
#define TkpFreeColor(tkColPtr)
#define TkSetPixmapColormap(p,c) {}
-#define Tk_FreeXId(display,xid)
#define TkpSync(display)
/*
diff --git a/mac/tkMacXStubs.c b/mac/tkMacXStubs.c
index ba25207..6e0c714 100644
--- a/mac/tkMacXStubs.c
+++ b/mac/tkMacXStubs.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacXStubs.c,v 1.3 1998/09/14 18:23:40 stanton Exp $
+ * RCS: @(#) $Id: tkMacXStubs.c,v 1.4 1999/03/10 07:04:45 stanton Exp $
*/
#include "tkInt.h"
@@ -274,6 +274,15 @@ DefaultErrorHandler(
}
+
+void
+Tk_FreeXId (
+ Display *display,
+ XID xid)
+{
+ /* no-op function needed for stubs implementation */
+}
+
char *
XGetAtomName(
Display * display,
@@ -707,3 +716,24 @@ TkGetDefaultScreenName(
}
return screenName;
}
+
+void Tk_3DHorizontalBevel (
+ Tk_Window tkwin,
+ Drawable drawable, Tk_3DBorder border, int x,
+ int y, int width, int height, int leftIn,
+ int rightIn, int topBevel, int relief )
+{
+ /* no-op required for stubs implementation */
+ /* this function will probably be filled in at some point */
+}
+
+void Tk_3DVerticalBevel (
+ Tk_Window tkwin,
+ Drawable drawable, Tk_3DBorder border, int x,
+ int y, int width, int height, int leftBevel,
+ int relief )
+{
+ /* no-op required for stubs implementation */
+ /* this function will probably be filled in at some point */
+}
+