aplied colorpanel fix patches

WINGs/Makefile.in

@@ -218,7 +218,7 @@ DIST_COMMON =  README ChangeLog Makefile.am Makefile.in TODO
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(libWINGs_a_SOURCES) $(libWUtil_a_SOURCES) $(wtest_SOURCES) $(wmquery_SOURCES) $(wmfile_SOURCES) $(fontl_SOURCES) $(testmywidget_SOURCES) $(testcolorpanel_SOURCES) $(connect_SOURCES)
 OBJECTS = $(libWINGs_a_OBJECTS) $(libWUtil_a_OBJECTS) $(wtest_OBJECTS) $(wmquery_OBJECTS) $(wmfile_OBJECTS) $(fontl_OBJECTS) $(testmywidget_OBJECTS) $(testcolorpanel_OBJECTS) $(connect_OBJECTS)
@@ -227,7 +227,7 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WINGs/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
@@ -482,7 +482,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pr $$/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

WINGs/Resources/Makefile.in

@@ -108,7 +108,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -150,7 +150,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pr $$/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

WINGs/WINGs.h

@@ -193,13 +193,13 @@ enum {
 };
 
 typedef enum {
-	WMGrayModeColorPanel,
- 	WMRGBModeColorPanel,
-	WMCMYKModeColorPanel,
-	WMHSBModeColorPanel,
-	WMCustomPaletteModeColorPanel,
-	WMColorListModeColorPanel,
-	WMWheelModeColorPanel
+	WMGrayModeColorPanel = 1,
+ 	WMRGBModeColorPanel = 2,
+	WMCMYKModeColorPanel = 3,
+	WMHSBModeColorPanel = 4,
+	WMCustomPaletteModeColorPanel = 5,
+	WMColorListModeColorPanel = 6,
+	WMWheelModeColorPanel = 7
 } WMColorPanelMode;
 
 

WINGs/WINGsP.h

@@ -368,6 +368,13 @@ extern _WINGsConfiguration WINGsConfiguration;
 
 #define W_VIEW_REALIZED(view)	(view)->flags.realized
 #define W_VIEW_MAPPED(view)	(view)->flags.mapped
+    
+#define W_VIEW_SCREEN(view)	(view)->screen
+#define W_VIEW_DRAWABLE(view)	(view)->window
+    
+#define W_VIEW_WIDTH(view)	(view)->size.width
+#define W_VIEW_HEIGHT(view)	(view)->size.height
+    
 
 #define W_PIXEL(c)		(c)->color.pixel
 

WINGs/testcolorpanel.c

@@ -25,6 +25,9 @@ int main(int argc, char **argv)
   WMScreen		*scr;
   WMPixmap		*pixmap;
   WMColorPanel	*panel;
+  WMColor	*startcolor;
+  char		*colorname = NULL;
+  int		i;
 
 #if 0
     XSynchronize(dpy, True);
@@ -40,11 +43,36 @@ int main(int argc, char **argv)
     exit(1);
   }
 
-  scr = WMCreateSimpleApplicationScreen(dpy);
+  for (i = 1; i < argc; i++) {
+      if (strcmp(argv[i], "-h")==0 || strcmp(argv[i], "--help")==0) {
+	  printf("testcolorpanel [-h] [--help] [-c <color>]"
+		 "[--color <color>]\n");
+	  exit(0);
+      }
+      if (strcmp(argv[i], "-c")==0 || strcmp(argv[i], "--color")==0) {
+	  i++;
+	  if (i >= argc) {
+	      printf("%s: missing argument for option '%s'\n",
+		      argv[0], argv[i-1]);
+	      exit(1);
+	  }
+	  colorname = argv[i];
+      }
+  }
 
+  scr = WMCreateSimpleApplicationScreen(dpy);
+	
   pixmap = WMCreatePixmapFromXPMData(scr, GNUSTEP_XPM);
-  WMSetApplicationIconImage(scr, pixmap); WMReleasePixmap(pixmap);
+  WMSetApplicationIconImage(scr, pixmap);
+  WMReleasePixmap(pixmap);
+  
   panel = WMGetColorPanel(scr);
+
+  if (colorname) {
+      startcolor = WMCreateNamedColor(scr, colorname, False);
+      WMSetColorPanelColor(panel, startcolor);
+      WMReleaseColor(startcolor);
+  }
   
   WMShowColorPanel(panel);
 

WINGs/wbutton.c

@@ -411,6 +411,8 @@ void
 WMSetButtonSelected(WMButton *bPtr, int isSelected)
 {
     bPtr->flags.selected = isSelected;
+ 
+    WMPostNotificationName(WMPushedRadioNotification, bPtr, NULL);
     
     if (bPtr->view->flags.realized) {
 	paintButton(bPtr);