diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkFrame.c | 10 | ||||
| -rw-r--r-- | generic/tkInt.decls | 9 | ||||
| -rw-r--r-- | generic/tkIntDecls.h | 14 | ||||
| -rw-r--r-- | generic/tkIntPlatDecls.h | 7 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 3 |
5 files changed, 29 insertions, 14 deletions
diff --git a/generic/tkFrame.c b/generic/tkFrame.c index d567815..f116f6c 100644 --- a/generic/tkFrame.c +++ b/generic/tkFrame.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: tkFrame.c,v 1.20 2005/01/10 04:15:02 chengyemao Exp $ + * RCS: @(#) $Id: tkFrame.c,v 1.21 2005/08/09 07:39:17 das Exp $ */ #include "default.h" @@ -1439,14 +1439,12 @@ DisplayFrame(clientData) if (framePtr->type != TYPE_LABELFRAME) { /* - * There is no label so there is just a simple rectangle to draw. + * Pass to platform specific draw function. In general, it just + * draws a simple rectangle, but it may "theme" the background. */ noLabel: - Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin), - framePtr->border, hlWidth, hlWidth, - Tk_Width(tkwin) - 2 * hlWidth, - Tk_Height(tkwin) - 2 * hlWidth, + TkpDrawFrame(tkwin, framePtr->border, hlWidth, framePtr->borderWidth, framePtr->relief); } else { Labelframe *labelframePtr = (Labelframe *) framePtr; diff --git a/generic/tkInt.decls b/generic/tkInt.decls index eb37556..2b9c7dd 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -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: tkInt.decls,v 1.38 2004/10/27 00:56:33 davygrvy Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.39 2005/08/09 07:39:17 das Exp $ library tk @@ -644,6 +644,11 @@ declare 151 generic { Tk_Canvas canvas, double *pointPtr, int numPoints) } +declare 152 generic { + void TkpDrawFrame(Tk_Window tkwin, Tk_3DBorder border, + int highlightWidth, int borderWidth, int relief) +} + ############################################################################## # Define the platform specific internal Tcl interface. These functions are @@ -1031,7 +1036,7 @@ declare 40 aqua { } declare 41 aqua { - int TkMacOSXZoomToplevel (WindowPtr whichWindow, Point where, short zoomPart) + int TkMacOSXZoomToplevel (WindowPtr whichWindow, short zoomPart) } declare 42 aqua { diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index bc9de70..ad29720 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.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: tkIntDecls.h,v 1.25 2004/08/19 14:43:42 dkf Exp $ + * RCS: @(#) $Id: tkIntDecls.h,v 1.26 2005/08/09 07:39:18 das Exp $ */ #ifndef _TKINTDECLS @@ -959,6 +959,13 @@ EXTERN void TkMakeRawCurvePostscript _ANSI_ARGS_(( Tcl_Interp * interp, Tk_Canvas canvas, double * pointPtr, int numPoints)); #endif +#ifndef TkpDrawFrame_TCL_DECLARED +#define TkpDrawFrame_TCL_DECLARED +/* 152 */ +EXTERN void TkpDrawFrame _ANSI_ARGS_((Tk_Window tkwin, + Tk_3DBorder border, int highlightWidth, + int borderWidth, int relief)); +#endif typedef struct TkIntStubs { int magic; @@ -1204,6 +1211,7 @@ typedef struct TkIntStubs { CONST Tk_OptionSpec * (*tkGetOptionSpec) _ANSI_ARGS_((CONST char * name, Tk_OptionTable optionTable)); /* 149 */ int (*tkMakeRawCurve) _ANSI_ARGS_((Tk_Canvas canvas, double * pointPtr, int numPoints, int numSteps, XPoint xPoints[], double dblPoints[])); /* 150 */ void (*tkMakeRawCurvePostscript) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Canvas canvas, double * pointPtr, int numPoints)); /* 151 */ + void (*tkpDrawFrame) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int highlightWidth, int borderWidth, int relief)); /* 152 */ } TkIntStubs; #ifdef __cplusplus @@ -1859,6 +1867,10 @@ extern TkIntStubs *tkIntStubsPtr; #define TkMakeRawCurvePostscript \ (tkIntStubsPtr->tkMakeRawCurvePostscript) /* 151 */ #endif +#ifndef TkpDrawFrame +#define TkpDrawFrame \ + (tkIntStubsPtr->tkpDrawFrame) /* 152 */ +#endif #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 1c6cbd9..a21f92b 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.22 2005/05/29 06:47:04 das Exp $ + * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.23 2005/08/09 07:39:18 das Exp $ */ #ifndef _TKINTPLATDECLS @@ -438,8 +438,7 @@ EXTERN void TkSuspendClipboard _ANSI_ARGS_((void)); #define TkMacOSXZoomToplevel_TCL_DECLARED /* 41 */ EXTERN int TkMacOSXZoomToplevel _ANSI_ARGS_(( - WindowPtr whichWindow, Point where, - short zoomPart)); + WindowPtr whichWindow, short zoomPart)); #endif #ifndef Tk_TopCoordsToWindow_TCL_DECLARED #define Tk_TopCoordsToWindow_TCL_DECLARED @@ -654,7 +653,7 @@ typedef struct TkIntPlatStubs { int (*tkSetMacColor) _ANSI_ARGS_((unsigned long pixel, RGBColor * macColor)); /* 38 */ void (*tkSetWMName) _ANSI_ARGS_((TkWindow * winPtr, Tk_Uid titleUid)); /* 39 */ void (*tkSuspendClipboard) _ANSI_ARGS_((void)); /* 40 */ - int (*tkMacOSXZoomToplevel) _ANSI_ARGS_((WindowPtr whichWindow, Point where, short zoomPart)); /* 41 */ + int (*tkMacOSXZoomToplevel) _ANSI_ARGS_((WindowPtr whichWindow, short zoomPart)); /* 41 */ Tk_Window (*tk_TopCoordsToWindow) _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int * newX, int * newY)); /* 42 */ MacDrawable * (*tkMacOSXContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 43 */ MacDrawable * (*tkMacOSXGetHostToplevel) _ANSI_ARGS_((TkWindow * winPtr)); /* 44 */ diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index bc415e5..508b415 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.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: tkStubInit.c,v 1.50 2005/05/29 06:47:05 das Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.51 2005/08/09 07:39:19 das Exp $ */ #include "tkInt.h" @@ -294,6 +294,7 @@ TkIntStubs tkIntStubs = { TkGetOptionSpec, /* 149 */ TkMakeRawCurve, /* 150 */ TkMakeRawCurvePostscript, /* 151 */ + TkpDrawFrame, /* 152 */ }; TkIntPlatStubs tkIntPlatStubs = { |