gdl r550 - in trunk: . docs/reference gdl

[jhs svn gnome org]

Author: jhs
Date: Thu Apr 16 08:15:20 2009
New Revision: 550
URL: http://svn.gnome.org/viewvc/gdl?rev=550&view=rev

Log:
2009-04-16  Joel Holdsworth <joel airwebreathe org uk>

  reviewed by: Johannes Schmid  <jhs gnome org>
	* docs/reference/gdl-sections.txt:
	* gdl/Makefile.am:
	* gdl/gdl-dock-item-grip.c (gdl_dock_item_grip_instance_init),
	(gdl_dock_item_grip_class_init):
	* gdl/gdl-stock.c:
	* gdl/gdl-stock.h:
	#471317 â invisible buttons in HCI theme

Removed:
   trunk/gdl/gdl-stock.c
   trunk/gdl/gdl-stock.h
Modified:
   trunk/ChangeLog
   trunk/docs/reference/gdl-sections.txt
   trunk/gdl/Makefile.am
   trunk/gdl/gdl-dock-item-grip.c

Modified: trunk/docs/reference/gdl-sections.txt
==============================================================================
--- trunk/docs/reference/gdl-sections.txt	(original)
+++ trunk/docs/reference/gdl-sections.txt	Thu Apr 16 08:15:20 2009
@@ -272,18 +272,6 @@
 </SECTION>
 
 <SECTION>
-<FILE>gdl</FILE>
-</SECTION>
-
-<SECTION>
-<FILE>gdl-stock</FILE>
-GDL_STOCK_CLOSE
-GDL_STOCK_MENU_LEFT
-GDL_STOCK_MENU_RIGHT
-gdl_stock_init
-</SECTION>
-
-<SECTION>
 <FILE>gdl-tools</FILE>
 DO_GDL_TRACE
 GDL_TRACE

Modified: trunk/gdl/Makefile.am
==============================================================================
--- trunk/gdl/Makefile.am	(original)
+++ trunk/gdl/Makefile.am	Thu Apr 16 08:15:20 2009
@@ -12,8 +12,7 @@
 	libgdlmarshal.c \
 	libgdlmarshal.h \
 	libgdltypebuiltins.c \
-	libgdltypebuiltins.h \
-	gdl-stock-icons.h
+	libgdltypebuiltins.h
 
 CLEANFILES =					\
 	libgdltypebuiltins.c			\
@@ -35,10 +34,8 @@
 	gdl-dock-layout.h \
 	gdl-dock-placeholder.h \
 	gdl-dock-bar.h \
-	gdl-switcher.h \
-	gdl-stock.h \
-	gdl-stock-icons.h
-
+	gdl-switcher.h
+	
 libgdl_1_la_SOURCES = \
 	$(libgdl_headers) \
 	gdl-i18n.h \
@@ -47,6 +44,8 @@
 	gdl-dock-master.c \
 	gdl-dock.c \
 	gdl-dock-item.c \
+	gdl-dock-item-button-image.h \
+	gdl-dock-item-button-image.c \
 	gdl-dock-item-grip.h \
 	gdl-dock-item-grip.c \
 	gdl-dock-notebook.c \
@@ -56,7 +55,6 @@
 	gdl-dock-placeholder.c \
 	gdl-dock-bar.c \
 	gdl-switcher.c \
-	gdl-stock.c \
 	libgdltypebuiltins.h \
 	libgdltypebuiltins.c \
 	libgdlmarshal.h \
@@ -81,22 +79,11 @@
 gladedir = $(datadir)/gdl/glade
 glade_DATA = layout.glade
 
-STOCK_ICONS = \
-	stock_close_icon stock-close-12.png \
-	stock_menu_left_icon stock-menu-left-12.png \
-	stock_menu_right_icon stock-menu-right-12.png
-
-STOCK_IMAGES = \
-	stock-close-12.png \
-	stock-menu-left-12.png \
-	stock-menu-right-12.png
-
 EXTRA_DIST = libgdlmarshal.list \
 	tree-expand.xpm \
 	tree-contract.xpm \
 	layout.glade \
-	program.xpm static.xpm shared.xpm \
-	$(STOCK_IMAGES)
+	program.xpm static.xpm shared.xpm
 
 # enumerations code generation
 
@@ -145,6 +132,3 @@
 	&& cp xgen-gmc $(@F) \
 	&& rm -f xgen-gmc
 
-gdl-stock-icons.h: $(STOCK_IMAGES)
-	gdk-pixbuf-csource --raw --build-list $(STOCK_ICONS) > $@
-

Modified: trunk/gdl/gdl-dock-item-grip.c
==============================================================================
--- trunk/gdl/gdl-dock-item-grip.c	(original)
+++ trunk/gdl/gdl-dock-item-grip.c	Thu Apr 16 08:15:20 2009
@@ -20,7 +20,7 @@
 #include <gtk/gtk.h>
 #include "gdl-dock-item.h"
 #include "gdl-dock-item-grip.h"
-#include "gdl-stock.h"
+#include "gdl-dock-item-button-image.h"
 #include "gdl-tools.h"
 
 #define ALIGN_BORDER 5
@@ -271,7 +271,7 @@
     gtk_button_set_relief (GTK_BUTTON (grip->_priv->close_button), GTK_RELIEF_NONE);
     gtk_widget_show (grip->_priv->close_button);
 
-    image = gtk_image_new_from_stock (GDL_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+    image = gdl_dock_item_button_image_new(GDL_DOCK_ITEM_BUTTON_IMAGE_CLOSE);
     gtk_container_add (GTK_CONTAINER (grip->_priv->close_button), image);
     gtk_widget_show (image);
 
@@ -288,7 +288,7 @@
     gtk_button_set_relief (GTK_BUTTON (grip->_priv->iconify_button), GTK_RELIEF_NONE);
     gtk_widget_show (grip->_priv->iconify_button);
 
-    image = gtk_image_new_from_stock (GDL_STOCK_MENU_LEFT, GTK_ICON_SIZE_MENU);
+    image = gdl_dock_item_button_image_new(GDL_DOCK_ITEM_BUTTON_IMAGE_ICONIFY);
     gtk_container_add (GTK_CONTAINER (grip->_priv->iconify_button), image);
     gtk_widget_show (image);
 
@@ -590,9 +590,6 @@
                              _("Dockitem which 'owns' this grip"),
                              GDL_TYPE_DOCK_ITEM,
                              G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
-    /* initialize stock images */
-    gdl_stock_init ();
 }
 
 static void