diff options
| author | hobbs <hobbs> | 2005-07-28 04:57:37 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2005-07-28 04:57:37 (GMT) |
| commit | a8b4cdc0ae29558241512cba5e42dc3cfb5a9c59 (patch) | |
| tree | 4870570f4a045ed0e9b5d90b6f2d1e2071b4ee8d /generic/tkFrame.c | |
| parent | 3caf558162fc4f2bb92f2d65f72f9f6532f34298 (diff) | |
| download | tk-a8b4cdc0ae29558241512cba5e42dc3cfb5a9c59.zip tk-a8b4cdc0ae29558241512cba5e42dc3cfb5a9c59.tar.gz tk-a8b4cdc0ae29558241512cba5e42dc3cfb5a9c59.tar.bz2 | |
* generic/tkFrame.c (DisplayFrame):
* generic/tkInt.decls: add TkpDrawFrame to allow for
* generic/tkIntDecls.h: platform-specific drawing into the frame/
* generic/tkStubInit.c: toplevel area. Currently only differs on
* generic/tkFrame.c: OS X (Aqua), which will draw a themed bg
* win/tkWinDraw.c: if tk::mac::useThemedToplevel == 1.
* unix/tkUnixDraw.c: Normal frames left alone until we can
* mac/tkMacDraw.c: better factor out frame drawing to be
* macosx/tkMacDraw.c: widget-specific.
Diffstat (limited to 'generic/tkFrame.c')
| -rw-r--r-- | generic/tkFrame.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/generic/tkFrame.c b/generic/tkFrame.c index 6be4c48..d80446c 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.15.2.1 2003/07/16 23:17:38 pspjuth Exp $ + * RCS: @(#) $Id: tkFrame.c,v 1.15.2.2 2005/07/28 04:57:37 hobbs Exp $ */ #include "default.h" @@ -1410,7 +1410,7 @@ DisplayFrame(clientData) if (hlWidth != 0) { GC fgGC, bgGC; - + bgGC = Tk_GCForColor(framePtr->highlightBgColorPtr, Tk_WindowId(tkwin)); if (framePtr->flags & GOT_FOCUS) { @@ -1432,14 +1432,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; @@ -1458,7 +1456,7 @@ DisplayFrame(clientData) pixmap = Tk_GetPixmap(framePtr->display, Tk_WindowId(tkwin), Tk_Width(tkwin), Tk_Height(tkwin), Tk_Depth(tkwin)); - + /* * Clear the pixmap. */ |