Added -proxyborderwidth option

6 files changed, 76 insertions, 63 deletions

diff --git a/doc/panedwindow.n b/doc/panedwindow.n
index f3c22be..6263d05 100644
--- a/doc/panedwindow.n
+++ b/doc/panedwindow.n
@@ -31,6 +31,9 @@ value accepted by \fBTk_GetPixels\fR. If an empty string, the widget will be
 made high enough to allow all contained widgets to have their natural height.
 .OP \-proxybackground proxyBackground ProxyBackground
 Background color to use when drawing the proxy.
+.OP \-proxyborderwidth proxyBorderWidth ProxyBorderWidth
+Specifies the width of the proxy. May be any value accepted by
+\fBTk_GetPixels\fR.
 .OP \-proxyrelief proxyRelief ProxyRelief
 Relief to use when drawing the proxy. May be any of the standard Tk
 relief values.
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index 96a4441..244eb09 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -148,6 +148,7 @@ typedef struct PanedWindow {
 				 * off-screen pixmap onto screen. */
     int proxyx, proxyy;		/* Proxy x,y coordinates. */
     Tk_3DBorder proxyBackground;/* Background color used to draw proxy. */
+    int proxyBorderWidth;	/* Borderwidth used to draw proxy. */
     int proxyRelief;		/* Relief used to draw proxy. */
     Slave **slaves;		/* Pointer to array of Slaves. */
     int numSlaves;		/* Number of slaves. */
@@ -303,6 +304,9 @@ static const Tk_OptionSpec optionSpecs[] = {
     {TK_OPTION_BORDER, "-proxybackground", "proxyBackground", "ProxyBackground",
 	 DEF_PANEDWINDOW_BG_COLOR, -1, Tk_Offset(PanedWindow, proxyBackground), 0,
 	 (ClientData) DEF_PANEDWINDOW_BG_MONO},
+    {TK_OPTION_PIXELS, "-proxyborderwidth", "proxyBorderWidth", "ProxyBorderWidth",
+	 DEF_PANEDWINDOW_PROXYBORDERWIDTH, -1, Tk_Offset(PanedWindow, proxyBorderWidth),
+	 0, 0, GEOMETRY},
     {TK_OPTION_RELIEF, "-proxyrelief", "proxyRelief", "Relief",
 	 DEF_PANEDWINDOW_PROXYRELIEF, -1, Tk_Offset(PanedWindow, proxyRelief),
 	 0, 0, 0},
@@ -2778,7 +2782,8 @@ DisplayProxyWindow(
      */
 
     Tk_Fill3DRectangle(tkwin, pixmap, pwPtr->proxyBackground, 0, 0,
-	    Tk_Width(tkwin), Tk_Height(tkwin), 2, pwPtr->proxyRelief);
+	    Tk_Width(tkwin), Tk_Height(tkwin), pwPtr->proxyBorderWidth,
+            pwPtr->proxyRelief);
 
 #ifndef TK_NO_DOUBLE_BUFFERING
     /*
diff --git a/macosx/tkMacOSXDefault.h b/macosx/tkMacOSXDefault.h
index ce8af8f..0db03bc 100644
--- a/macosx/tkMacOSXDefault.h
+++ b/macosx/tkMacOSXDefault.h
@@ -400,24 +400,25 @@
  * Defaults for panedwindows
  */
 
-#define DEF_PANEDWINDOW_BG_COLOR	NORMAL_BG
-#define DEF_PANEDWINDOW_BG_MONO		WHITE
-#define DEF_PANEDWINDOW_BORDERWIDTH	"1"
-#define DEF_PANEDWINDOW_CURSOR		""
-#define DEF_PANEDWINDOW_HANDLEPAD	"8"
-#define DEF_PANEDWINDOW_HANDLESIZE	"8"
-#define DEF_PANEDWINDOW_HEIGHT		""
-#define DEF_PANEDWINDOW_OPAQUERESIZE	"1"
-#define DEF_PANEDWINDOW_ORIENT		"horizontal"
-#define DEF_PANEDWINDOW_PROXYBACKGROUND	WHITE
-#define DEF_PANEDWINDOW_PROXYRELIEF	"flat"
-#define DEF_PANEDWINDOW_RELIEF		"flat"
-#define DEF_PANEDWINDOW_SASHCURSOR	""
-#define DEF_PANEDWINDOW_SASHPAD		"0"
-#define DEF_PANEDWINDOW_SASHRELIEF	"flat"
-#define DEF_PANEDWINDOW_SASHWIDTH	"3"
-#define DEF_PANEDWINDOW_SHOWHANDLE	"0"
-#define DEF_PANEDWINDOW_WIDTH		""
+#define DEF_PANEDWINDOW_BG_COLOR		NORMAL_BG
+#define DEF_PANEDWINDOW_BG_MONO			WHITE
+#define DEF_PANEDWINDOW_BORDERWIDTH		"1"
+#define DEF_PANEDWINDOW_CURSOR			""
+#define DEF_PANEDWINDOW_HANDLEPAD		"8"
+#define DEF_PANEDWINDOW_HANDLESIZE		"8"
+#define DEF_PANEDWINDOW_HEIGHT			""
+#define DEF_PANEDWINDOW_OPAQUERESIZE		"1"
+#define DEF_PANEDWINDOW_ORIENT			"horizontal"
+#define DEF_PANEDWINDOW_PROXYBORDERWIDTH	"2"
+#define DEF_PANEDWINDOW_PROXYBACKGROUND		WHITE
+#define DEF_PANEDWINDOW_PROXYRELIEF		"flat"
+#define DEF_PANEDWINDOW_RELIEF			"flat"
+#define DEF_PANEDWINDOW_SASHCURSOR		""
+#define DEF_PANEDWINDOW_SASHPAD			"0"
+#define DEF_PANEDWINDOW_SASHRELIEF		"flat"
+#define DEF_PANEDWINDOW_SASHWIDTH		"3"
+#define DEF_PANEDWINDOW_SHOWHANDLE		"0"
+#define DEF_PANEDWINDOW_WIDTH			""
 
 /*
  * Defaults for panedwindow panes
diff --git a/tests/panedwindow.test b/tests/panedwindow.test
index 2e800bc..7620f84 100644
--- a/tests/panedwindow.test
+++ b/tests/panedwindow.test
@@ -34,24 +34,26 @@ foreach {testName testData} {
 	1.5 {bad relief "1.5": must be flat, groove, raised, ridge, solid, or sunken}}
     panedwindow-1.10 {-proxybackground
 	"#f0a0a0" "#f0a0a0" non-existent {unknown color name "non-existent"}}
-    panedwindow-1.11 {-orient
+    panedwindow-1.11 {-proxyborderwidth
+	1.3 1 badValue {bad screen distance "badValue"}}
+    panedwindow-1.12 {-orient
 	horizontal horizontal
 	badValue {bad orient "badValue": must be horizontal or vertical}}
-    panedwindow-1.12 {-relief
+    panedwindow-1.13 {-relief
 	groove groove
 	1.5 {bad relief "1.5": must be flat, groove, raised, ridge, solid, or sunken}}
-    panedwindow-1.13 {-sashcursor
+    panedwindow-1.14 {-sashcursor
 	arrow arrow badValue {bad cursor spec "badValue"}}
-    panedwindow-1.14 {-sashpad
+    panedwindow-1.15 {-sashpad
 	1.3 1 badValue {bad screen distance "badValue"}}
-    panedwindow-1.15 {-sashrelief
+    panedwindow-1.16 {-sashrelief
 	groove groove
 	1.5 {bad relief "1.5": must be flat, groove, raised, ridge, solid, or sunken}}
-    panedwindow-1.16 {-sashwidth
+    panedwindow-1.17 {-sashwidth
 	10 10 badValue {bad screen distance "badValue"}}
-    panedwindow-1.17 {-showhandle
+    panedwindow-1.18 {-showhandle
 	true 1 foo {expected boolean value but got "foo"}}
-    panedwindow-1.18 {-width
+    panedwindow-1.19 {-width
 	402 402 badValue {bad screen distance "badValue"}}
 } {
     lassign $testData optionName goodIn goodOut badIn badOut
diff --git a/unix/tkUnixDefault.h b/unix/tkUnixDefault.h
index f2cdf4b..e5b2598 100644
--- a/unix/tkUnixDefault.h
+++ b/unix/tkUnixDefault.h
@@ -358,24 +358,25 @@
  * Defaults for panedwindows
  */
 
-#define DEF_PANEDWINDOW_BG_COLOR	NORMAL_BG
-#define DEF_PANEDWINDOW_BG_MONO		WHITE
-#define DEF_PANEDWINDOW_BORDERWIDTH	"1"
-#define DEF_PANEDWINDOW_CURSOR		""
-#define DEF_PANEDWINDOW_HANDLEPAD	"8"
-#define DEF_PANEDWINDOW_HANDLESIZE	"8"
-#define DEF_PANEDWINDOW_HEIGHT		""
-#define DEF_PANEDWINDOW_OPAQUERESIZE	"1"
-#define DEF_PANEDWINDOW_ORIENT		"horizontal"
-#define DEF_PANEDWINDOW_PROXYBACKGROUND	WHITE
-#define DEF_PANEDWINDOW_PROXYRELIEF	"flat"
-#define DEF_PANEDWINDOW_RELIEF		"flat"
-#define DEF_PANEDWINDOW_SASHCURSOR	""
-#define DEF_PANEDWINDOW_SASHPAD		"0"
-#define DEF_PANEDWINDOW_SASHRELIEF	"flat"
-#define DEF_PANEDWINDOW_SASHWIDTH	"3"
-#define DEF_PANEDWINDOW_SHOWHANDLE	"0"
-#define DEF_PANEDWINDOW_WIDTH		""
+#define DEF_PANEDWINDOW_BG_COLOR		NORMAL_BG
+#define DEF_PANEDWINDOW_BG_MONO			WHITE
+#define DEF_PANEDWINDOW_BORDERWIDTH		"1"
+#define DEF_PANEDWINDOW_CURSOR			""
+#define DEF_PANEDWINDOW_HANDLEPAD		"8"
+#define DEF_PANEDWINDOW_HANDLESIZE		"8"
+#define DEF_PANEDWINDOW_HEIGHT			""
+#define DEF_PANEDWINDOW_OPAQUERESIZE		"1"
+#define DEF_PANEDWINDOW_ORIENT			"horizontal"
+#define DEF_PANEDWINDOW_PROXYBORDERWIDTH	"2"
+#define DEF_PANEDWINDOW_PROXYBACKGROUND		WHITE
+#define DEF_PANEDWINDOW_PROXYRELIEF		"flat"
+#define DEF_PANEDWINDOW_RELIEF			"flat"
+#define DEF_PANEDWINDOW_SASHCURSOR		""
+#define DEF_PANEDWINDOW_SASHPAD			"0"
+#define DEF_PANEDWINDOW_SASHRELIEF		"flat"
+#define DEF_PANEDWINDOW_SASHWIDTH		"3"
+#define DEF_PANEDWINDOW_SHOWHANDLE		"0"
+#define DEF_PANEDWINDOW_WIDTH			""
 
 /*
  * Defaults for panedwindow panes
diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h
index 60c098f..8cceb2e 100644
--- a/win/tkWinDefault.h
+++ b/win/tkWinDefault.h
@@ -361,24 +361,25 @@
  * Defaults for panedwindows
  */
 
-#define DEF_PANEDWINDOW_BG_COLOR	NORMAL_BG
-#define DEF_PANEDWINDOW_BG_MONO		WHITE
-#define DEF_PANEDWINDOW_BORDERWIDTH	"1"
-#define DEF_PANEDWINDOW_CURSOR		""
-#define DEF_PANEDWINDOW_HANDLEPAD	"8"
-#define DEF_PANEDWINDOW_HANDLESIZE	"8"
-#define DEF_PANEDWINDOW_HEIGHT		""
-#define DEF_PANEDWINDOW_OPAQUERESIZE	"1"
-#define DEF_PANEDWINDOW_ORIENT		"horizontal"
-#define DEF_PANEDWINDOW_PROXYBACKGROUND	WHITE
-#define DEF_PANEDWINDOW_PROXYRELIEF	"flat"
-#define DEF_PANEDWINDOW_RELIEF		"flat"
-#define DEF_PANEDWINDOW_SASHCURSOR	""
-#define DEF_PANEDWINDOW_SASHPAD		"0"
-#define DEF_PANEDWINDOW_SASHRELIEF	"flat"
-#define DEF_PANEDWINDOW_SASHWIDTH	"3"
-#define DEF_PANEDWINDOW_SHOWHANDLE	"0"
-#define DEF_PANEDWINDOW_WIDTH		""
+#define DEF_PANEDWINDOW_BG_COLOR		NORMAL_BG
+#define DEF_PANEDWINDOW_BG_MONO			WHITE
+#define DEF_PANEDWINDOW_BORDERWIDTH		"1"
+#define DEF_PANEDWINDOW_CURSOR			""
+#define DEF_PANEDWINDOW_HANDLEPAD		"8"
+#define DEF_PANEDWINDOW_HANDLESIZE		"8"
+#define DEF_PANEDWINDOW_HEIGHT			""
+#define DEF_PANEDWINDOW_OPAQUERESIZE		"1"
+#define DEF_PANEDWINDOW_ORIENT			"horizontal"
+#define DEF_PANEDWINDOW_PROXYBORDERWIDTH	"2"
+#define DEF_PANEDWINDOW_PROXYBACKGROUND		WHITE
+#define DEF_PANEDWINDOW_PROXYRELIEF		"flat"
+#define DEF_PANEDWINDOW_RELIEF			"flat"
+#define DEF_PANEDWINDOW_SASHCURSOR		""
+#define DEF_PANEDWINDOW_SASHPAD			"0"
+#define DEF_PANEDWINDOW_SASHRELIEF		"flat"
+#define DEF_PANEDWINDOW_SASHWIDTH		"3"
+#define DEF_PANEDWINDOW_SHOWHANDLE		"0"
+#define DEF_PANEDWINDOW_WIDTH			""
 
 /*
  * Defaults for panedwindow panes