Make it possible to specify additional modules to load via a setting.

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

diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index d0667c4bc3edceba956708a51c3a0385c927b743..10f7cdcfbb30c4885546b086ad60ff1e11f70539 100644 (file)
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -24,6 +24,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
+#include "gtkalias.h"
 #include "gtkcheckbutton.h"
 #include "gtkintl.h"
 #include "gtklabel.h"
@@ -95,16 +97,16 @@ gtk_check_button_class_init (GtkCheckButtonClass *class)
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("indicator_size",
-                                                            _("Indicator Size"),
-                                                            _("Size of check or radio indicator"),
+                                                            P_("Indicator Size"),
+                                                            P_("Size of check or radio indicator"),
                                                             0,
                                                             G_MAXINT,
                                                             INDICATOR_SIZE,
                                                             G_PARAM_READABLE));
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("indicator_spacing",
-                                                            _("Indicator Spacing"),
-                                                            _("Spacing around check or radio indicator"),
+                                                            P_("Indicator Spacing"),
+                                                            P_("Spacing around check or radio indicator"),
                                                             0,
                                                             G_MAXINT,
                                                             INDICATOR_SPACING,
@@ -415,6 +417,8 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
        state_type = GTK_STATE_ACTIVE;
       else if (button->in_button)
        state_type = GTK_STATE_PRELIGHT;
+      else if (!GTK_WIDGET_IS_SENSITIVE (widget))
+       state_type = GTK_STATE_INSENSITIVE;
       else
        state_type = GTK_STATE_NORMAL;
       
@@ -440,7 +444,7 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
                                  new_area.width, new_area.height);
            }
        }
-      
+
       gtk_paint_check (widget->style, widget->window,
                       state_type, shadow_type,
                       area, widget, "checkbutton",