diff options
| author | hobbs <hobbs> | 2006-12-13 20:40:32 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2006-12-13 20:40:32 (GMT) |
| commit | 318393c4af319ed15ef4a5d6e3f5b12259fe695d (patch) | |
| tree | b78142e59560b4ba6f8b517da62ade6b3b163148 | |
| parent | f38f2bb782da9c10fa2bd98ac08136ade6fcb22f (diff) | |
| download | tk-318393c4af319ed15ef4a5d6e3f5b12259fe695d.zip tk-318393c4af319ed15ef4a5d6e3f5b12259fe695d.tar.gz tk-318393c4af319ed15ef4a5d6e3f5b12259fe695d.tar.bz2 | |
* generic/ttk/ttkInit.c:
* generic/ttk/ttkTreeview.c: make treeview exist by default
* generic/ttk/ttkPanedwindow.c: s/TtkPaned_Init/TtkPanedwindow_Init/
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | generic/ttk/ttkInit.c | 10 | ||||
| -rw-r--r-- | generic/ttk/ttkPanedwindow.c | 4 | ||||
| -rw-r--r-- | generic/ttk/ttkTreeview.c | 6 |
4 files changed, 10 insertions, 14 deletions
@@ -1,5 +1,9 @@ 2006-12-13 Jeff Hobbs <jeffh@ActiveState.com> + * generic/ttk/ttkInit.c: + * generic/ttk/ttkTreeview.c: make treeview exist by default + * generic/ttk/ttkPanedwindow.c: s/TtkPaned_Init/TtkPanedwindow_Init/ + * win/Makefile.in, unix/Makefile.in (demo): add 'demo' target 2006-12-13 Joe English <jenglish@users.sourceforge.net> diff --git a/generic/ttk/ttkInit.c b/generic/ttk/ttkInit.c index 0b3143d..c4e4e6a 100644 --- a/generic/ttk/ttkInit.c +++ b/generic/ttk/ttkInit.c @@ -1,4 +1,4 @@ -/* $Id: ttkInit.c,v 1.2 2006/11/03 03:06:22 das Exp $ +/* $Id: ttkInit.c,v 1.3 2006/12/13 20:40:32 hobbs Exp $ * Copyright (c) 2003, Joe English * * Ttk package: initialization routine and miscellaneous utilities. @@ -207,10 +207,8 @@ extern WidgetSpec ttkSizegripWidgetSpec; extern int TtkProgressbar_Init(Tcl_Interp *); extern int TtkNotebook_Init(Tcl_Interp *); extern int TtkEntryWidget_Init(Tcl_Interp *); -#ifdef TTK_TREEVIEW_WIDGET extern int TtkTreeview_Init(Tcl_Interp *); -#endif -extern int TtkPaned_Init(Tcl_Interp *); +extern int TtkPanedwindow_Init(Tcl_Interp *); #ifdef TTK_SQUARE_WIDGET extern int TtkSquareWidget_Init(Tcl_Interp *); #endif @@ -231,10 +229,8 @@ static void RegisterWidgets(Tcl_Interp *interp) TtkNotebook_Init(interp); TtkEntryWidget_Init(interp); TtkProgressbar_Init(interp); - TtkPaned_Init(interp); -#ifdef TTK_TREEVIEW_WIDGET + TtkPanedwindow_Init(interp); TtkTreeview_Init(interp); -#endif #ifdef TTK_SQUARE_WIDGET TtkSquareWidget_Init(interp); #endif diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c index 2bd3f1b..d53cb71 100644 --- a/generic/ttk/ttkPanedwindow.c +++ b/generic/ttk/ttkPanedwindow.c @@ -1,4 +1,4 @@ -/* $Id: ttkPanedwindow.c,v 1.5 2006/11/27 06:53:55 jenglish Exp $ +/* $Id: ttkPanedwindow.c,v 1.6 2006/12/13 20:40:32 hobbs Exp $ * * Copyright (c) 2005, Joe English. Freely redistributable. * @@ -799,7 +799,7 @@ TTK_END_LAYOUT /*------------------------------------------------------------------------ * +++ Registration routine. */ -MODULE_SCOPE int TtkPaned_Init(Tcl_Interp *interp) +MODULE_SCOPE int TtkPanedwindow_Init(Tcl_Interp *interp) { Ttk_Theme themePtr = Ttk_GetDefaultTheme(interp); RegisterWidget(interp, "ttk::panedwindow", &PanedWidgetSpec); diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c index 6990c8f..cf75ee9 100644 --- a/generic/ttk/ttkTreeview.c +++ b/generic/ttk/ttkTreeview.c @@ -1,5 +1,5 @@ /* - * $Id: ttkTreeview.c,v 1.6 2006/12/09 20:53:35 jenglish Exp $ + * $Id: ttkTreeview.c,v 1.7 2006/12/13 20:40:32 hobbs Exp $ * Copyright (c) 2004, Joe English * * ttk::treeview widget implementation. @@ -10,8 +10,6 @@ #include "ttkTheme.h" #include "ttkWidget.h" -#ifdef TTK_TREEVIEW_WIDGET - #define DEF_TREE_ROWS "10" #define DEF_TREE_PADDING "4" #define DEF_COLWIDTH "200" @@ -2971,6 +2969,4 @@ MODULE_SCOPE int TtkTreeview_Init(Tcl_Interp *interp) return TCL_OK; } -#endif /* TTK_TREEVIEW_WIDGET */ - /*EOF*/ |