X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxoptions.c;h=3df99a77db9d5d1a4c584e6e47a03d3d35aaf0d7;hb=2eb3eb048b16f2ffd1f1c8dad3987871b0f9bd72;hp=48da90bd6a1e2ae691f005dfba6870b44527a85a;hpb=c10e83b937328313e82070f5714eea0337758a1e;p=xboard.git

diff --git a/gtk/xoptions.c b/gtk/xoptions.c
index 48da90b..3df99a7 100644
--- a/gtk/xoptions.c
+++ b/gtk/xoptions.c
@@ -1,7 +1,7 @@
 /*
  * xoptions.c -- Move list window, part of X front end for XBoard
  *
- * Copyright 2000, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ * Copyright 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
  * ------------------------------------------------------------------------
  *
  * GNU XBoard is free software: you can redistribute it and/or modify
@@ -52,7 +52,7 @@ extern char *getenv();
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #ifdef OSXAPP
-#  include <gtkmacintegration/gtkosxapplication.h>
+#  include <gtkmacintegration-gtk2/gtkosxapplication.h>
 #endif
 
 #include "common.h"
@@ -244,6 +244,12 @@ SetWidgetLabel (Option *opt, char *buf)
 }
 
 void
+SetComboChoice (Option *opt, int n)
+{
+    gtk_combo_box_set_active(opt->handle, n);
+}
+
+void
 SetDialogTitle (DialogClass dlg, char *title)
 {
     gtk_window_set_title(GTK_WINDOW(shells[dlg]), title);
@@ -530,11 +536,11 @@ HighlightText (Option *opt, int from, int to, Boolean highlight)
     if(!(opt->min & INIT)) {
 	opt->min |= INIT; // each memo its own init flag!
 	gtk_text_buffer_create_tag(opt->handle, "highlight", "background", "yellow", NULL);
-	gtk_text_buffer_create_tag(opt->handle, "normal", "background", "white", NULL);
     }
     gtk_text_buffer_get_iter_at_offset(opt->handle, &start, from);
     gtk_text_buffer_get_iter_at_offset(opt->handle, &end, to);
-    gtk_text_buffer_apply_tag_by_name(opt->handle, highlight ? "highlight" : "normal", &start, &end);
+    if(highlight) gtk_text_buffer_apply_tag_by_name(opt->handle, "highlight", &start, &end);
+    else gtk_text_buffer_remove_tag_by_name(opt->handle, "highlight", &start, &end);
 }
 
 static char **names;