summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRaymond Penners <pennersr@src.gnome.org>2004-07-01 21:30:16 +0000
committerRaymond Penners <pennersr@src.gnome.org>2004-07-01 21:30:16 +0000
commitf93cf125f00b79defaf48c39a866d6481d9e3483 (patch)
treefa887f6ba87e30cb6832e43295b5092a6763ddec /modules
parent2e85ab0743aa2df351c0e5a0cfdcb814aac0d673 (diff)
downloadgdk-pixbuf-f93cf125f00b79defaf48c39a866d6481d9e3483.tar.gz
Button icons configurable, 0.6.1
Diffstat (limited to 'modules')
-rwxr-xr-xmodules/engines/ms-windows/ChangeLog.old8
-rwxr-xr-xmodules/engines/ms-windows/Theme/gtk-2.0/gtkrc1
-rwxr-xr-xmodules/engines/ms-windows/msw_style.c6
3 files changed, 9 insertions, 6 deletions
diff --git a/modules/engines/ms-windows/ChangeLog.old b/modules/engines/ms-windows/ChangeLog.old
index 8020b9bbe..4e6b0a5a3 100755
--- a/modules/engines/ms-windows/ChangeLog.old
+++ b/modules/engines/ms-windows/ChangeLog.old
@@ -1,3 +1,11 @@
+2004-07-01 Raymond Penners <raymond@dotsphinx.com>
+
+ * === Released 0.6.1 ===
+
+ * src/msw_style.c,src/Theme/gtk-2.0/gtkrc: Removed hard-coded icon
+ button blocking. It is now configurable from within the gtkrc
+ file, but still disabled by default.
+
2004-06-02 Dom Lachowicz <cinamod@hotmail.com>
* src/msw_style.c: Disable icons in buttons
diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
index 5ee437457..4411c6e34 100755
--- a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
+++ b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
@@ -1,5 +1,6 @@
# TODO: we should probably obtain these from a Win32 IconMetrics struct
gtk-icon-sizes="gtk-menu=12,12:gtk-small-toolbar=12,12:gtk-large-toolbar=16,16:gtk-dnd=32,32"
+gtk-button-images=0
style "msw-default"
{
diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 14ec5ab2f..e0050af15 100755
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -453,12 +453,6 @@ setup_menu_settings (GtkSettings * settings)
if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0)
win95 = TRUE;
- if (klazz) {
- if (g_object_class_find_property (klazz, "gtk-button-images")) {
- g_object_set (G_OBJECT (settings), "gtk-button-images", 0, NULL);
- }
- }
-
if (!win95) {
if (SystemParametersInfo (SPI_GETMENUSHOWDELAY, 0, &menu_delay, 0)) {
if (klazz) {