diff options
| author | ericm <ericm> | 2000-05-10 00:09:38 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-05-10 00:09:38 (GMT) |
| commit | 7ff73db610e3d2efd82c272471c0dfe16d5745b8 (patch) | |
| tree | 36475aa7b20157ca2cd0fba5339eb61b1484aead /unix | |
| parent | 5766ce10779959eb0437e49fc4bdb3045982a63d (diff) | |
| download | tk-7ff73db610e3d2efd82c272471c0dfe16d5745b8.zip tk-7ff73db610e3d2efd82c272471c0dfe16d5745b8.tar.gz tk-7ff73db610e3d2efd82c272471c0dfe16d5745b8.tar.bz2 | |
* doc/button.n: Added documentation for link relief.
* tests/button.test: Added tests for link relief for buttons.
* generic/tk.h (TK_CONFIG_LINK_OK): Added definition of
TK_RELIEF_LINK, TK_OPTION_LINK_OK and TK_CONFIG_LINK_OK. [RFE: 4348]
* generic/tk3d.c: Added support for link relief. [RFE: 4348]
* mac/tkMacButton.c (TkpDisplayButton):
* unix/tkUnixButton.c (TkpDisplayButton): Added support for link
relief. [RFE: 4348]
* generic/tkOldConfig.c (Tk_ConfigureWidget):
* generic/tkConfig.c (DoObjConfig): Added understanding of link
relief, which is allowed only for widgets that have
TK_OPTION_LINK_OK or TK_CONFIG_LINK_OK set for the "-relief"
option. [RFE: 4348]
* generic/tkButton.c: Added TK_OPTION_LINK_OK to "-relief" option
for buttons. [RFE: 4348]
* win/tkWinWm.c (EX_TRANSIENT_STYLE): Removed WS_EX_TOOLWINDOW
style bit, so that transient windows have full-size titlebars
(like the tk_getOpenFile dialog).
* win/tkWinMenu.c (GetMenuSeparatorGeometry): Tweaked height
requested for separator bars to be (linespace - (2*descent))
instead of just (linespace); this makes the separator occupy a
more correct amount of vertical space. [Bug: 5303].
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixButton.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c index 2d4cb25..5cce667 100644 --- a/unix/tkUnixButton.c +++ b/unix/tkUnixButton.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: tkUnixButton.c,v 1.3 1999/04/16 01:51:45 stanton Exp $ + * RCS: @(#) $Id: tkUnixButton.c,v 1.4 2000/05/10 00:09:40 ericm Exp $ */ #include "tkButton.h" @@ -122,6 +122,20 @@ TkpDisplayButton(clientData) : TK_RELIEF_RAISED; } + /* + * LINK relief means that the button has a raised relief when it is + * active, and a flat relief otherwise (like toolbar buttons). It + * is supported for true buttons only. + */ + + if ((butPtr->type == TYPE_BUTTON) && butPtr->relief == TK_RELIEF_LINK) { + if (butPtr->state == STATE_ACTIVE) { + relief = TK_RELIEF_RAISED; + } else { + relief = TK_RELIEF_FLAT; + } + } + offset = (butPtr->type == TYPE_BUTTON) && !Tk_StrictMotif(butPtr->tkwin); /* |