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 /win | |
| 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 'win')
| -rw-r--r-- | win/tkWinMenu.c | 4 | ||||
| -rw-r--r-- | win/tkWinWm.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index e379faa..61784c6 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.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: tkWinMenu.c,v 1.8 2000/04/13 20:51:55 ericm Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.9 2000/05/10 00:09:40 ericm Exp $ */ #define OEMRESOURCE @@ -1384,7 +1384,7 @@ GetMenuSeparatorGeometry ( int *heightPtr) /* The resulting height */ { *widthPtr = 0; - *heightPtr = fmPtr->linespace; + *heightPtr = fmPtr->linespace - (2 * fmPtr->descent); } /* diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 7be7598..ff29259 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.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: tkWinWm.c,v 1.22 2000/04/15 17:38:13 hobbs Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.23 2000/05/10 00:09:41 ericm Exp $ */ #include "tkWinInt.h" @@ -224,8 +224,7 @@ typedef struct TkWmInfo { #define WM_TRANSIENT_STYLE \ (WS_POPUP|WS_CAPTION|WS_SYSMENU|WS_CLIPSIBLINGS|CS_DBLCLKS) -#define EX_TRANSIENT_STYLE \ - (WS_EX_TOOLWINDOW|WS_EX_DLGMODALFRAME) +#define EX_TRANSIENT_STYLE (WS_EX_DLGMODALFRAME) /* * The following structure is the official type record for geometry |