[Bug 2997657]: Removed -container from labelframe

documentation since it does not work as expected and does not make
sense as a container. Added note to frame about restrictions when used
as a container.

4 files changed, 15 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 2ba4876..30150b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-04-04  Peter Spjuth  <peter.spjuth@gmail.com>
+
+	* doc/labelframe.n:
+	* doc/frame.n:
+	* generic/tkFrame.c: [Bug 2997657]: Removed -container from labelframe
+	documentation since it does not work as expected and does not make
+	sense as a container. Added note to frame about restrictions when used
+	as a container.
+
 2011-03-28  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tkTextBTree.c: [Bug 3129527]: Fix buffer overflow w/ GCC 4.5 and
diff --git a/doc/frame.n b/doc/frame.n
index e960f10..e76e53e 100644
--- a/doc/frame.n
+++ b/doc/frame.n
@@ -54,6 +54,8 @@ things like geometry requests.  The window should not have any
 children of its own in this application.
 This option may not be changed with the \fBconfigure\fR
 widget command.
+Note that \fB-borderwidth\R, \fB-padx\fR and \fB-pady\R are ignored when
+configured as a container since a container has no border.
 .OP \-height height Height
 Specifies the desired height for the window in any of the forms
 acceptable to \fBTk_GetPixels\fR.  If this option is less than or equal
diff --git a/doc/labelframe.n b/doc/labelframe.n
index 0bdd460..952df09 100644
--- a/doc/labelframe.n
+++ b/doc/labelframe.n
@@ -46,15 +46,6 @@ If the \fBcolormap\fR option is not specified, the new window
 uses the same colormap as its parent.
 This option may not be changed with the \fBconfigure\fR
 widget command.
-.OP \-container container Container
-The value must be a boolean.  If true, it means that this window will
-be used as a container in which some other application will be embedded
-(for example, a Tk toplevel can be embedded using the \fB\-use\fR option).
-The window will support the appropriate window manager protocols for
-things like geometry requests.  The window should not have any
-children of its own in this application.
-This option may not be changed with the \fBconfigure\fR
-widget command.
 .OP \-height height Height
 Specifies the desired height for the window in any of the forms
 acceptable to \fBTk_GetPixels\fR.
diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index ddf0b5a..da4e242 100644
--- a/generic/tkFrame.c
+++ b/generic/tkFrame.c
@@ -183,6 +183,10 @@ static const Tk_OptionSpec commonOptSpec[] = {
     {TK_OPTION_STRING, "-colormap", "colormap", "Colormap",
 	DEF_FRAME_COLORMAP, -1, Tk_Offset(Frame, colormapName),
 	TK_OPTION_NULL_OK, 0, 0},
+    /*
+     * Having -container is useless in a labelframe since a container has
+     * no border. It should be deprecated.
+     */
     {TK_OPTION_BOOLEAN, "-container", "container", "Container",
 	DEF_FRAME_CONTAINER, -1, Tk_Offset(Frame, isContainer), 0, 0, 0},
     {TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor",