diff options
author | jenglish <jenglish@flightlab.com> | 2007-11-25 18:11:10 (GMT) |
---|---|---|
committer | jenglish <jenglish@flightlab.com> | 2007-11-25 18:11:10 (GMT) |
commit | 37a492a973a6293e2324e7a9d66dee21daf1d033 (patch) | |
tree | 22175f1ab591c35a78f6f7b5914368ecf10d3186 /generic/ttk/ttkFrame.c | |
parent | 81e551c563bf0c2e7ba07e4b6f207bbae50242df (diff) | |
download | tk-37a492a973a6293e2324e7a9d66dee21daf1d033.zip tk-37a492a973a6293e2324e7a9d66dee21daf1d033.tar.gz tk-37a492a973a6293e2324e7a9d66dee21daf1d033.tar.bz2 |
Internal Ttk_Manager API updates; Fixed [Bug 1343984];
Added [$nb hide] method; [$nb add] on already-managed windows
no longer throws an error, can be used to re-add a hidden tab.
Updated docs and test suite.
Diffstat (limited to 'generic/ttk/ttkFrame.c')
-rw-r--r-- | generic/ttk/ttkFrame.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/generic/ttk/ttkFrame.c b/generic/ttk/ttkFrame.c index 58a114f..1bb0c98 100644 --- a/generic/ttk/ttkFrame.c +++ b/generic/ttk/ttkFrame.c @@ -1,4 +1,4 @@ -/* $Id: ttkFrame.c,v 1.9 2007/11/19 01:49:07 jenglish Exp $ +/* $Id: ttkFrame.c,v 1.10 2007/11/25 18:11:12 jenglish Exp $ * Copyright (c) 2004, Joe English * * ttk::frame and ttk::labelframe widgets. @@ -482,6 +482,11 @@ static void LabelframePlaceSlaves(void *recordPtr) } } +static int LabelRequest(void *managerData, int index, int width, int height) +{ + return 1; +} + /* LabelRemoved -- * Unset the -labelwidget option. * @@ -489,17 +494,17 @@ static void LabelframePlaceSlaves(void *recordPtr) * This routine is also called when the widget voluntarily forgets * the slave in LabelframeConfigure. */ -static void LabelRemoved(Ttk_Manager *mgr, int slaveIndex) +static void LabelRemoved(void *managerData, int slaveIndex) { - Labelframe *lframe = Ttk_ManagerData(mgr); + Labelframe *lframe = managerData; lframe->label.labelWidget = 0; } -static Ttk_ManagerSpec LabelframeManagerSpec = -{ +static Ttk_ManagerSpec LabelframeManagerSpec = { { "labelframe", Ttk_GeometryRequestProc, Ttk_LostSlaveProc }, LabelframeSize, LabelframePlaceSlaves, + LabelRequest, LabelRemoved }; |