Changeset 531

Timestamp:

07/13/08 16:33:46 (2 months ago)

Author:

Mike Wey

Message:

Make the ImageMenuItem? Constructor accept the StockID enum

Files:

• trunk/src/gobject/ObjectG.d (modified) (1 diff)
• trunk/src/gtk/ImageMenuItem.d (modified) (4 diffs)
• trunk/wrap/APILookupGtk.txt (modified) (2 diffs)

trunk/src/gobject/ObjectG.d

@@ -180 +180 @@
-     *  data = a pointer
-     */
-:
+
-    {
-        //writefln("setData objectG=%X data=%X type %s",gObject,data,key);

trunk/src/gtk/ImageMenuItem.d

@@ -44 +44 @@
- *  - gtk_image_menu_item_new_with_label
- *  - gtk_image_menu_item_new_with_mnemonic
+ *  - gtk_image_menu_item_new_from_stock
- * omit signals:
- * imports:
@@ -143 +144 @@
-    
-    /**
-     */
-    
-    /**
-     * Sets the image of image_menu_item to the given widget.
-     * Note that it depends on the show-menu-images setting whether
-     * the image will be displayed or not.
-     * Params:
-     * image =  a widget to set as the image for the menu item.
-     */
-    public void setImage(Widget image)
-    {
-        // void gtk_image_menu_item_set_image (GtkImageMenuItem *image_menu_item,  GtkWidget *image);
-        gtk_image_menu_item_set_image(gtkImageMenuItem, (image is null) ? null : image.getWidgetStruct());
-    }
-    
-    /**
-     * Gets the widget that is currently set as the image of image_menu_item.
-     * See gtk_image_menu_item_set_image().
-     * Returns: the widget set as image of image_menu_item.
-     */
-    public Widget getImage()
-    {
-        // GtkWidget* gtk_image_menu_item_get_image (GtkImageMenuItem *image_menu_item);
-        auto p = gtk_image_menu_item_get_image(gtkImageMenuItem);
-        if(p is null)
-        {
-            return null;
-        }
-        return new Widget(cast(GtkWidget*) p);
-    }
-    
-    /**
-     * Creates a new GtkImageMenuItem with an empty label.
-     */
-    public this ()
-    {
-        // GtkWidget* gtk_image_menu_item_new (void);
-        auto p = gtk_image_menu_item_new();
-        if(p is null)
-        {
-            throw new Exception("Construction failure.");
-        }
-        this(cast(GtkImageMenuItem*) p);
-    }
-    
-    /**
-     * Creates a new GtkImageMenuItem containing the image and text from a
-     * stock item. Some stock ids have preprocessor macros like GTK_STOCK_OK
@@ -198 +153 @@
-     * gtk_accel_map_add_entry() to register it.
-     * Params:
-stockId =  the name of the stock item.
+StockID = the name of the stock item
-     * accelGroup =  the GtkAccelGroup to add the menu items accelerator to,
-     *  or NULL.
-     */
-string stockId
+StockID stockID
-    {
-        // GtkWidget* gtk_image_menu_item_new_from_stock (const gchar *stock_id,  GtkAccelGroup *accel_group);
-stockId
+StockDesc[stockID]
-        if(p is null)
-        {
@@ -212 +167 @@
-        this(cast(GtkImageMenuItem*) p);
-    }
+    
+    /**
+     */
+    
+    /**
+     * Sets the image of image_menu_item to the given widget.
+     * Note that it depends on the show-menu-images setting whether
+     * the image will be displayed or not.
+     * Params:
+     * image =  a widget to set as the image for the menu item.
+     */
+    public void setImage(Widget image)
+    {
+        // void gtk_image_menu_item_set_image (GtkImageMenuItem *image_menu_item,  GtkWidget *image);
+        gtk_image_menu_item_set_image(gtkImageMenuItem, (image is null) ? null : image.getWidgetStruct());
+    }
+    
+    /**
+     * Gets the widget that is currently set as the image of image_menu_item.
+     * See gtk_image_menu_item_set_image().
+     * Returns: the widget set as image of image_menu_item.
+     */
+    public Widget getImage()
+    {
+        // GtkWidget* gtk_image_menu_item_get_image (GtkImageMenuItem *image_menu_item);
+        auto p = gtk_image_menu_item_get_image(gtkImageMenuItem);
+        if(p is null)
+        {
+            return null;
+        }
+        return new Widget(cast(GtkWidget*) p);
+    }
+    
+    /**
+     * Creates a new GtkImageMenuItem with an empty label.
+     */
+    public this ()
+    {
+        // GtkWidget* gtk_image_menu_item_new (void);
+        auto p = gtk_image_menu_item_new();
+        if(p is null)
+        {
+            throw new Exception("Construction failure.");
+        }
+        this(cast(GtkImageMenuItem*) p);
+    }
-}

trunk/wrap/APILookupGtk.txt

@@ -4303 +4303 @@
-nocode: gtk_image_menu_item_new_with_label
-nocode: gtk_image_menu_item_new_with_mnemonic
+nocode: gtk_image_menu_item_new_from_stock
-
-code: start
@@ -4327 +4328 @@
-            this(cast(GtkImageMenuItem*)gtk_image_menu_item_new_with_label(Str.toStringz(label)) );
-        }
+    }
+
+    /**
+     * Creates a new GtkImageMenuItem containing the image and text from a
+     * stock item. Some stock ids have preprocessor macros like GTK_STOCK_OK
+     * and GTK_STOCK_APPLY.
+     * If you want this menu item to have changeable accelerators, then pass in
+     * NULL for accel_group. Next call gtk_menu_item_set_accel_path() with an
+     * appropriate path for the menu item, use gtk_stock_lookup() to look up the
+     * standard accelerator for the stock item, and if one is found, call
+     * gtk_accel_map_add_entry() to register it.
+     * Params:
+     * StockID = the name of the stock item
+     * accelGroup =  the GtkAccelGroup to add the menu items accelerator to,
+     *  or NULL.
+     */
+    public this (StockID stockID, AccelGroup accelGroup)
+    {
+        // GtkWidget* gtk_image_menu_item_new_from_stock (const gchar *stock_id,  GtkAccelGroup *accel_group);
+        auto p = gtk_image_menu_item_new_from_stock(Str.toStringz(StockDesc[stockID]), (accelGroup is null) ? null : accelGroup.getAccelGroupStruct());
+        if(p is null)
+        {
+            throw new Exception("Construction failure.");
+        }
+        this(cast(GtkImageMenuItem*) p);
-    }
-code: end