diff options
author | jenglish <jenglish@flightlab.com> | 2006-11-07 03:45:27 (GMT) |
---|---|---|
committer | jenglish <jenglish@flightlab.com> | 2006-11-07 03:45:27 (GMT) |
commit | 643b19451d3b2bd1e080733c4c93c5a9daaad63a (patch) | |
tree | 8067b063a85bcd662fa0771dc6b6ab068aa3f9f3 /generic | |
parent | 4e674e6b1ec465975a7138542ed175cc6f9acda3 (diff) | |
download | tk-643b19451d3b2bd1e080733c4c93c5a9daaad63a.zip tk-643b19451d3b2bd1e080733c4c93c5a9daaad63a.tar.gz tk-643b19451d3b2bd1e080733c4c93c5a9daaad63a.tar.bz2 |
Miscellaneous minor changes to re-sync Ttk codebase with Tile CVS:
fix comments damaged by overzealous search-and-destroy;
removed obsolete [style default] synonym for [ttk::style configure];
removed other dead code.
Diffstat (limited to 'generic')
-rw-r--r-- | generic/ttk/ttkClassicTheme.c | 7 | ||||
-rw-r--r-- | generic/ttk/ttkPanedwindow.c | 9 | ||||
-rw-r--r-- | generic/ttk/ttkTheme.c | 9 | ||||
-rw-r--r-- | generic/ttk/ttkTreeview.c | 4 |
4 files changed, 12 insertions, 17 deletions
diff --git a/generic/ttk/ttkClassicTheme.c b/generic/ttk/ttkClassicTheme.c index f62c6f2..19164aa 100644 --- a/generic/ttk/ttkClassicTheme.c +++ b/generic/ttk/ttkClassicTheme.c @@ -1,5 +1,5 @@ /* - * $Id: ttkClassicTheme.c,v 1.2 2006/11/03 03:06:22 das Exp $ + * $Id: ttkClassicTheme.c,v 1.3 2006/11/07 03:45:27 jenglish Exp $ * * Copyright (c) 2004, Joe English * @@ -288,12 +288,11 @@ static Ttk_ElementSpec ArrowElementSpec = /*------------------------------------------------------------------------ - * +++ Sash element (for ttk::paned window) + * +++ Sash element (for ttk::panedwindow) * * NOTES: * - * Paned windows with -orient horizontal use vertical sashes, - * and vice versa. + * panedwindows with -orient horizontal use vertical sashes, and vice versa. * * Interpretation of -sashrelief 'groove' and 'ridge' are * swapped wrt. the core panedwindow, which (I think) has them backwards. diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c index 7fe1cc8..ac8d9cc 100644 --- a/generic/ttk/ttkPanedwindow.c +++ b/generic/ttk/ttkPanedwindow.c @@ -1,8 +1,8 @@ -/* $Id: ttkPanedwindow.c,v 1.2 2006/11/03 03:06:22 das Exp $ +/* $Id: ttkPanedwindow.c,v 1.3 2006/11/07 03:45:28 jenglish Exp $ * * Copyright (c) 2005, Joe English. Freely redistributable. * - * Ttk widget set: ttk::panedwindow widget. + * ttk::panedwindow widget implementation. * * TODO: track active/pressed sash. */ @@ -378,7 +378,7 @@ static void PanedGeometryRequestProc( } static Ttk_ManagerSpec PanedManagerSpec = { - { "paned", PanedGeometryRequestProc, Ttk_LostSlaveProc }, + { "panedwindow", PanedGeometryRequestProc, Ttk_LostSlaveProc }, PaneOptionSpecs, sizeof(Pane), PanedSize, PanedPlaceSlaves, @@ -390,6 +390,7 @@ static Ttk_ManagerSpec PanedManagerSpec = { /*------------------------------------------------------------------------ * +++ Event handler. * + * <<NOTE-PW-LEAVE-NOTIFYINFERIOR>> * Tk does not execute binding scripts for <Leave> events when * the pointer crosses from a parent to a child. This widget * needs to know when that happens, though, so it can reset @@ -780,7 +781,7 @@ static Ttk_ElementSpec SashElementSpec = { }; TTK_BEGIN_LAYOUT(PanedLayout) - TTK_NODE("Paned.background", 0) /* @@@ BUG: empty layouts don't work */ + TTK_NODE("Panedwindow.background", 0)/* @@@ BUG: empty layouts don't work */ TTK_END_LAYOUT TTK_BEGIN_LAYOUT(HorizontalSashLayout) diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c index af33606..cca5d3a 100644 --- a/generic/ttk/ttkTheme.c +++ b/generic/ttk/ttkTheme.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. * - * $Id: ttkTheme.c,v 1.2 2006/11/03 03:06:22 das Exp $ + * $Id: ttkTheme.c,v 1.3 2006/11/07 03:45:28 jenglish Exp $ */ #include <stdlib.h> @@ -504,7 +504,7 @@ void Ttk_RegisterCleanup( * Scheduled as an idle callback; clientData is a StylePackageData *. * * Sends a <<ThemeChanged>> event to every widget in the hierarchy. - * Ttk widgets respond to this by calling the WorldChanged class proc, + * Widgets respond to this by calling the WorldChanged class proc, * which in turn recreates the layout. * * The Tk C API doesn't doesn't provide an easy way to traverse @@ -516,8 +516,7 @@ static void ThemeChangedProc(ClientData clientData) static char ThemeChangedScript[] = "ttk::ThemeChanged"; StylePackageData *pkgPtr = (StylePackageData *)clientData; - if (Tcl_EvalEx(pkgPtr->interp, ThemeChangedScript, -1, TCL_EVAL_GLOBAL) - != TCL_OK) { + if (Tcl_GlobalEval(pkgPtr->interp, ThemeChangedScript) != TCL_OK) { Tcl_BackgroundError(pkgPtr->interp); } pkgPtr->themeChangePending = 0; @@ -1629,8 +1628,6 @@ static struct Ensemble StyleEnsemble[] = { { "layout", StyleLayoutCmd, 0 }, { "theme", 0, StyleThemeEnsemble }, { "element", 0, StyleElementEnsemble }, - - { "default", StyleConfigureCmd, 0 }, /* TEMP: for pre-0.7 compatibility */ { NULL, 0, 0 } }; diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c index ec61201..f34d452 100644 --- a/generic/ttk/ttkTreeview.c +++ b/generic/ttk/ttkTreeview.c @@ -1,5 +1,5 @@ /* - * $Id: ttkTreeview.c,v 1.2 2006/11/03 03:06:22 das Exp $ + * $Id: ttkTreeview.c,v 1.3 2006/11/07 03:45:28 jenglish Exp $ * Copyright (c) 2004, Joe English * * Ttk widget set: treeview widget. @@ -2967,8 +2967,6 @@ MODULE_SCOPE int TtkTreeview_Init(Tcl_Interp *interp) Ttk_RegisterLayout(theme, "Heading", HeadingLayout); Ttk_RegisterLayout(theme, "Row", RowLayout); - Tcl_PkgProvide(interp, "ttk::treeview", TTK_VERSION); - return TCL_OK; } |