summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorpspjuth <peter.spjuth@gmail.com>2001-09-26 21:36:19 (GMT)
committerpspjuth <peter.spjuth@gmail.com>2001-09-26 21:36:19 (GMT)
commit071818f331706f06d0498f1f9d5f4e9121395daf (patch)
tree20c06e6412fd77d17f1141ae292692607300a6da /win
parent05383a493ead1b30256c79a19782ecdbfa74522a (diff)
downloadtk-071818f331706f06d0498f1f9d5f4e9121395daf.zip
tk-071818f331706f06d0498f1f9d5f4e9121395daf.tar.gz
tk-071818f331706f06d0498f1f9d5f4e9121395daf.tar.bz2
Added labelframe widget. TIP#18.
Diffstat (limited to 'win')
-rw-r--r--win/tkWinDefault.h24
-rw-r--r--win/tkWinFont.c7
2 files changed, 25 insertions, 6 deletions
diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h
index 2e6d903..b1ea6cb 100644
--- a/win/tkWinDefault.h
+++ b/win/tkWinDefault.h
@@ -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: tkWinDefault.h,v 1.9 2000/07/28 16:34:56 ericm Exp $
+ * RCS: @(#) $Id: tkWinDefault.h,v 1.10 2001/09/26 21:36:19 pspjuth Exp $
*/
#ifndef _TKWINDEFAULT
@@ -32,14 +32,14 @@
#define NORMAL_BG "SystemButtonFace"
#define NORMAL_FG "SystemButtonText"
#define ACTIVE_BG NORMAL_BG
-#define TEXT_FG "SystemWindowText"
+#define TEXT_FG "SystemWindowText"
#define SELECT_BG "SystemHighlight"
#define SELECT_FG "SystemHighlightText"
#define TROUGH "SystemScrollbar"
#define INDICATOR "SystemWindow"
#define DISABLED "SystemDisabledText"
-#define MENU_BG "SystemMenu"
-#define MENU_FG "SystemMenuText"
+#define MENU_BG "SystemMenu"
+#define MENU_FG "SystemMenuText"
#define HIGHLIGHT "SystemWindowFrame"
/*
@@ -190,13 +190,26 @@
#define DEF_FRAME_HIGHLIGHT_BG NORMAL_BG
#define DEF_FRAME_HIGHLIGHT HIGHLIGHT
#define DEF_FRAME_HIGHLIGHT_WIDTH "0"
+#define DEF_FRAME_PADX "0"
+#define DEF_FRAME_PADY "0"
#define DEF_FRAME_RELIEF "flat"
#define DEF_FRAME_TAKE_FOCUS "0"
-#define DEF_FRAME_USE ""
#define DEF_FRAME_VISUAL ""
#define DEF_FRAME_WIDTH "0"
/*
+ * Defaults for labelframes:
+ */
+
+#define DEF_LABELFRAME_BORDER_WIDTH "2"
+#define DEF_LABELFRAME_CLASS "Labelframe"
+#define DEF_LABELFRAME_RELIEF "groove"
+#define DEF_LABELFRAME_FG NORMAL_FG
+#define DEF_LABELFRAME_FONT CTL_FONT
+#define DEF_LABELFRAME_TEXT ""
+#define DEF_LABELFRAME_LABELANCHOR "nw"
+
+/*
* Defaults for listboxes:
*/
@@ -467,5 +480,6 @@
#define DEF_TOPLEVEL_CLASS "Toplevel"
#define DEF_TOPLEVEL_MENU ""
#define DEF_TOPLEVEL_SCREEN ""
+#define DEF_TOPLEVEL_USE ""
#endif /* _TKWINDEFAULT */
diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index 98a0545..b98e3b9 100644
--- a/win/tkWinFont.c
+++ b/win/tkWinFont.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: tkWinFont.c,v 1.13 2001/09/21 21:34:10 hobbs Exp $
+ * RCS: @(#) $Id: tkWinFont.c,v 1.14 2001/09/26 21:36:19 pspjuth Exp $
*/
#include "tkWinInt.h"
@@ -826,6 +826,11 @@ Tk_DrawChars(
dc = TkWinGetDrawableDC(display, drawable, &state);
SetROP2(dc, tkpWinRopModes[gc->function]);
+
+ if ((gc->clip_mask != None) &&
+ ((TkpClipMask*)gc->clip_mask)->type == TKP_CLIP_REGION) {
+ SelectClipRgn(dc, (HRGN)((TkpClipMask*)gc->clip_mask)->value.region);
+ }
if ((gc->fill_style == FillStippled
|| gc->fill_style == FillOpaqueStippled)