Rename property to be more neutral

[~andy/gtk] / gtk / gtkcoloreditor.c

diff --git a/gtk/gtkcoloreditor.c b/gtk/gtkcoloreditor.c
index 923c2726c6e01c15c20010ba5ba4aca59af2133e..8cbbf21541c48e7141fa7c7253da69d7653243ef 100644 (file)
--- a/gtk/gtkcoloreditor.c
+++ b/gtk/gtkcoloreditor.c
@@ -12,19 +12,13 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* TODO
  * - touch
- * - accessible color names
  * - accessible relations for popups
- * - api to replace palette
  * - saving per-application (?)
- * - better checkmark
- * - use css for swatches
  * - better popup theming
  */
 
@@ -45,6 +39,7 @@
 #include "gtklabel.h"
 #include "gtkspinbutton.h"
 #include "gtkintl.h"
+#include "gtkstylecontext.h"
 
 #include <math.h>
 
@@ -403,6 +398,7 @@ gtk_color_editor_init (GtkColorEditor *editor)
 
   /* Construct the main UI */
   editor->priv->swatch = swatch = gtk_color_swatch_new ();
+  gtk_color_swatch_set_selectable (GTK_COLOR_SWATCH (editor->priv->swatch), FALSE);
   gtk_widget_set_events (swatch, gtk_widget_get_events (swatch)
                                  & ~(GDK_BUTTON_PRESS_MASK
                                      | GDK_BUTTON_RELEASE_MASK