Changeset 541

Timestamp:

07/18/08 17:19:49 (3 months ago)

Author:

Mike Wey

Message:

Change Exceptions in the APILookupFiles, and add missing glib/ConstructionException.d

Files:

• trunk/src/gdk/RgbCmap.d (modified) (1 diff)
• trunk/src/gdkpixbuf/PixbufLoader.d (modified) (1 diff)
• trunk/src/glib/ConstructionException.d (added)
• trunk/src/gtk/Button.d (modified) (3 diffs)
• trunk/src/gtk/CellEditable.d (modified) (3 diffs)
• trunk/src/gtk/CellView.d (modified) (1 diff)
• trunk/src/gtk/CheckButton.d (modified) (1 diff)
• trunk/src/gtk/CheckMenuItem.d (modified) (1 diff)
• trunk/src/gtk/ComboBox.d (modified) (1 diff)
• trunk/src/gtk/ComboBoxEntry.d (modified) (1 diff)
• trunk/src/gtk/Expander.d (modified) (1 diff)
• trunk/src/gtk/FileChooserDialog.d (modified) (4 diffs)
• trunk/src/gtk/Image.d (modified) (2 diffs)
• trunk/src/gtk/ImageMenuItem.d (modified) (3 diffs)
• trunk/src/gtk/Label.d (modified) (1 diff)
• trunk/src/gtk/ListStore.d (modified) (1 diff)
• trunk/src/gtk/MenuItem.d (modified) (1 diff)
• trunk/src/gtk/MenuToolButton.d (modified) (3 diffs)
• trunk/src/gtk/MessageDialog.d (modified) (4 diffs)
• trunk/src/gtk/RadioButton.d (modified) (2 diffs)
• trunk/src/gtk/RadioMenuItem.d (modified) (2 diffs)
• trunk/src/gtk/RecentAction.d (modified) (4 diffs)
• trunk/src/gtk/RecentChooserDialog.d (modified) (4 diffs)
• trunk/src/gtk/ScrolledWindow.d (modified) (1 diff)
• trunk/src/gtk/StatusIcon.d (modified) (2 diffs)
• trunk/src/gtk/Table.d (modified) (1 diff)
• trunk/src/gtk/ToggleButton.d (modified) (1 diff)
• trunk/src/gtk/TreeIter.d (modified) (1 diff)
• trunk/src/gtk/TreeModel.d (modified) (3 diffs)
• trunk/src/gtk/TreePath.d (modified) (1 diff)
• trunk/src/gtk/TreeStore.d (modified) (1 diff)
• trunk/src/gtk/TreeViewColumn.d (modified) (1 diff)
• trunk/srcgl/glgdk/GLConfig.d (modified) (2 diffs)
• trunk/wrap/APILookupGLd.txt (modified) (2 diffs)
• trunk/wrap/APILookupGdk.txt (modified) (1 diff)
• trunk/wrap/APILookupGdkPixbuf.txt (modified) (1 diff)
• trunk/wrap/APILookupGtk.txt (modified) (48 diffs)

trunk/src/gdk/RgbCmap.d

@@ -182 +182 @@
-        if(p is null)
-        {
-
-
-
+
-        }
-        this(cast(GdkRgbCmap*) p);

trunk/src/gdkpixbuf/PixbufLoader.d

@@ -175 +175 @@
-     *  A newly-created pixbuf loader.
-     */
-
-
+
+
+
+
+
-        if ( isMimeType )
-        {
-            // GdkPixbufLoader* gdk_pixbuf_loader_new_with_mime_type  (const char *mime_type,  GError **error);
-this(cast(GdkPixbufLoader*)gdk_pixbuf_loader_new_with_mime_type(Str.toStringz(type), error) 
+p = cast(GdkPixbufLoader*)gdk_pixbuf_loader_new_with_mime_type(Str.toStringz(type), &err
-        }
-        else
-        {
-            // GdkPixbufLoader* gdk_pixbuf_loader_new_with_type  (const char *image_type,  GError **error);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    

trunk/src/gtk/Button.d

@@ -166 +166 @@
-     * Returns:
-     *  a new GtkButton
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (string label, bool mnemonic=true)
-    {
+        GtkButton* p;
+        
-        if ( mnemonic )
-        {
-            // GtkWidget* gtk_button_new_with_mnemonic (const gchar *label);
-this(cast(GtkButton*)gtk_button_new_with_mnemonic(Str.toStringz(label)) 
+p = cast(GtkButton*)gtk_button_new_with_mnemonic(Str.toStringz(label)
-        }
-        else
-        {
-            // GtkWidget* gtk_button_new_with_label (const gchar *label);
-
-
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -189 +199 @@
-     * Params:
-     *  StockID = the name of the stock item
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (StockID stockID, bool hideLabel=false)
@@ -201 +212 @@
-        else
-        {
-
+
+
+
+
+
+
+
+
-        }
-        

trunk/src/gtk/CellEditable.d

@@ -43 +43 @@
- * omit signals:
- * imports:
-;
+
- *  - gdk.Event
- *  - gtk.CellEditableT
@@ -62 +62 @@
-
-
-;
+
-private import gdk.Event;
-private import gtk.CellEditableT;
@@ -93 +93 @@
-        {
-            this = null;
-            version(Exceptions) throw new Exception("Null gtkCellEditable passed to constructor.");
-            else return;
-        }
-        //Check if there already is a D object for this gtk struct
-        void* ptr = getDObject(cast(GObject*)gtkCellEditable);
-        if( ptr !is null )
-        {
-            this = cast(CellEditable)ptr;
-            return;
-        }
+        
-        super(cast(GObject*)gtkCellEditable);
-        this.gtkCellEditable = gtkCellEditable;

trunk/src/gtk/CellView.d

@@ -149 +149 @@
-     * Returns:
-     *  A newly created GtkCellView widget.
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (string text, bool markup=true)
-    {
+        GtkCellView* p;
+        
-        if ( markup )
-        {
-            // GtkWidget* gtk_cell_view_new_with_markup (const gchar *markup);
-this(cast(GtkCellView*)gtk_cell_view_new_with_markup(Str.toStringz(text)) 
+p = cast(GtkCellView*)gtk_cell_view_new_with_markup(Str.toStringz(text)
-        }
-        else
-        {
-            // GtkWidget* gtk_cell_view_new_with_text (const gchar *text);
-
-
+
+
+
+
+
+
+
+
+
-    }
-    

trunk/src/gtk/CheckButton.d

@@ -123 +123 @@
-     *  mnemonic character
-     *  mnemonic = true if the button has an mnemnonic
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (string label, bool mnemonic=true)
-    {
+        GtkCheckButton* p;
+        
-        if ( mnemonic )
-        {
-            // GtkWidget* gtk_check_button_new_with_mnemonic  (const gchar *label);
-this(cast(GtkCheckButton*)gtk_check_button_new_with_mnemonic(Str.toStringz(label)) 
+p = cast(GtkCheckButton*)gtk_check_button_new_with_mnemonic(Str.toStringz(label)
-        }
-        else
-        {
-            // GtkWidget* gtk_check_button_new_with_label (const gchar *label);
-this(cast(GtkCheckButton*)gtk_check_button_new_with_label(Str.toStringz(label)) 
+p = cast(GtkCheckButton*)gtk_check_button_new_with_label(Str.toStringz(label)
-        }
+        
+        if(p is null)
+        {
+            throw new ConstructionException("null returned by gtk_check_button_new_");
+        }
+        
+        this(p);
-    }
-    

trunk/src/gtk/CheckMenuItem.d

@@ -125 +125 @@
-     *  will be created using gtk_label_new_with_mnemonic(), so underscores
-     *  in label indicate the mnemonic for the menu item.
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (string label, bool mnemonic=true)
-    {
+        GtkCheckMenuItem* p;
+        
-        if ( mnemonic )
-        {
-            // GtkWidget* gtk_check_menu_item_new_with_mnemonic  (const gchar *label);
-this(cast(GtkCheckMenuItem*)gtk_check_menu_item_new_with_mnemonic(Str.toStringz(label)) 
+p = cast(GtkCheckMenuItem*)gtk_check_menu_item_new_with_mnemonic(Str.toStringz(label)
-        }
-        else
-        {
-            // GtkWidget* gtk_check_menu_item_new_with_label  (const gchar *label);
-
-
+
+
+
+
+
+
+
+
+
-    }
-    

trunk/src/gtk/ComboBox.d

@@ -183 +183 @@
-     * Returns:
-     *  A new GtkComboBox.
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (bool text=true)
-    {
+        GtkComboBox* p;
-        if ( text )
-        {
-            // GtkWidget* gtk_combo_box_new_text (void);
-this(cast(GtkComboBox*)gtk_combo_box_new_text() 
+p = cast(GtkComboBox*)gtk_combo_box_new_text(
-        }
-        else
-        {
-            // GtkWidget* gtk_combo_box_new (void);
-
-
+
+
+
+
+
+
+
+
+
-    }
-    

trunk/src/gtk/ComboBoxEntry.d

@@ -145 +145 @@
-     * Returns:
-     *  A new GtkComboBoxEntry.
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (bool text=true)
-    {
+        GtkComboBoxEntry* p;
+        
-        if ( text )
-        {
-            // GtkWidget* gtk_combo_box_entry_new_text (void);
-this(cast(GtkComboBoxEntry*)gtk_combo_box_entry_new_text() 
+p = cast(GtkComboBoxEntry*)gtk_combo_box_entry_new_text(
-        }
-        else
-        {
-            // GtkWidget* gtk_combo_box_entry_new (void);
-this(cast(GtkComboBoxEntry*)gtk_combo_box_entry_new() 
+p = cast(GtkComboBoxEntry*)gtk_combo_box_entry_new(
-        }
-        
+        if(p is null)
+        {
+            throw new ConstructionException("null returned by gtk_combo_box_entry_new");
+        }
+        
+        this(p);
-    }
-    

trunk/src/gtk/Expander.d

@@ -174 +174 @@
-     *  underscores). The first underlined character represents a keyboard
-     *  accelerator called a mnemonic.
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (string label, bool mnemonic=true)
-    {
+        GtkExpander* p;
+        
-        if ( mnemonic )
-        {
-            // GtkWidget* gtk_expander_new_with_mnemonic (const gchar *label);
-this(cast(GtkExpander*)gtk_expander_new_with_mnemonic(Str.toStringz(label)) 
+p = cast(GtkExpander*)gtk_expander_new_with_mnemonic(Str.toStringz(label)
-        }
-        else
-        {
-            // GtkWidget* gtk_expander_new (const gchar *label);
-
-
+
+
+
+
+
+
+
+
+
-    }
-    

trunk/src/gtk/FileChooserDialog.d

@@ -225 +225 @@
-     *  buttonsText = text to go in the buttons
-     *  responses = response ID's for the buttons
-
-
+
-     */
-    this(string title, Window parent, FileChooserAction action,  string[] buttonsText=null, ResponseType[] responses=null)
@@ -241 +240 @@
-        }
-        
-
-
+
-        Str.toStringz(title),
-        parent.getWindowStruct(),
-        action,
-        null,
-
+
+
+
+
+
+
+
+
+
-        addButtons(buttonsText, responses);
-    }
@@ -264 +270 @@
-     *  buttonsText = text to go in the buttons
-     *  responses = response ID's for the buttons
-     * Returns:
-     *  a new GtkFileChooserDialog
-     * See_Also:
-     *  GtkFileChooser, GtkDialog
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (string title, Window parent, GtkFileChooserAction action, string backend,  string[] buttonsText=null, ResponseType[] responses=null)
-    {
-        // GtkWidget* gtk_file_chooser_dialog_new_with_backend  (const gchar *title,  GtkWindow *parent,  GtkFileChooserAction action,  const gchar *backend,  const gchar *first_button_text,  ...);
-
-
+
-        Str.toStringz(title),
-        parent.getWindowStruct(),
@@ -280 +284 @@
-        null,
-        0
-
+
+
+
+
+
+
+
+
+
-        if ( buttonsText  is  null )
-        {

trunk/src/gtk/Image.d

@@ -202 +202 @@
-     * Returns:
-     *  a new GtkImage displaying the stock icon
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (StockID stockID, GtkIconSize size)
-    {
-        // GtkWidget* gtk_image_new_from_stock (const gchar *stock_id,  GtkIconSize size);
-
+
+
+
+
+
+
-    }
-    
@@ -219 +225 @@
-     * Returns:
-     *  a new GtkImage displaying the themed icon
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (string iconName, GtkIconSize size)
-    {
-        // GtkWidget* gtk_image_new_from_icon_name (const gchar *icon_name,  GtkIconSize size);
-
+
+
+
+
+
+
-    }
-    

trunk/src/gtk/ImageMenuItem.d

@@ -129 +129 @@
-     * Returns:
-     *  a new GtkImageMenuItem.
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (string label, bool mnemonic=true)
-    {
+        GtkImageMenuItem* p;
+        
-        if ( mnemonic )
-        {
-            // GtkWidget* gtk_image_menu_item_new_with_mnemonic  (const gchar *label);
-this(cast(GtkImageMenuItem*)gtk_image_menu_item_new_with_mnemonic(Str.toStringz(label)) 
+p = cast(GtkImageMenuItem*)gtk_image_menu_item_new_with_mnemonic(Str.toStringz(label)
-        }
-        else
-        {
-            // GtkWidget* gtk_image_menu_item_new_with_label  (const gchar *label);
-
-
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -157 +167 @@
-     * accelGroup =  the GtkAccelGroup to add the menu items accelerator to,
-     *  or NULL.
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (StockID stockID, AccelGroup accelGroup)
@@ -164 +175 @@
-        if(p is null)
-        {
-Exception("Construction failure.
+ConstructionException("null returned by gtk_image_menu_item_new_from_stock
-        }
-        this(cast(GtkImageMenuItem*) p);

trunk/src/gtk/Label.d

@@ -202 +202 @@
-     *  mnemonic character
-     *  mnemonic = when false uses the literal text passed in without mnemonic
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (string str, bool mnemonic=true)
-    {
+        GtkLabel* p;
+        
-        if ( mnemonic )
-        {
-            // GtkWidget* gtk_label_new_with_mnemonic (const gchar *str);
-this(cast(GtkLabel*)gtk_label_new_with_mnemonic(Str.toStringz(str)) 
+p = cast(GtkLabel*)gtk_label_new_with_mnemonic(Str.toStringz(str)
-        }
-        else
-        {
-            // GtkWidget* gtk_label_new (const gchar *str);
-
-
+
+
+
+
+
+
+
+
+
-    }
-    

trunk/src/gtk/ListStore.d

@@ -286 +286 @@
-     * Returns:
-     *  a new GtkListStore
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (GType[] types)
-    {
-        // GtkListStore* gtk_list_store_newv (gint n_columns,  GType *types);
-
+
+
+
+
+
+
-    }
-    

trunk/src/gtk/MenuItem.d

@@ -191 +191 @@
-     *  will be created using gtk_label_new_with_mnemonic(), so underscores
-     *  in label indicate the mnemonic for the menu item.
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (string label, bool mnemonic=true)
-    {
+        GtkMenuItem* p;
+        
-        if ( mnemonic )
-        {
-            // GtkWidget* gtk_menu_item_new_with_mnemonic (const gchar *label);
-this(cast(GtkMenuItem*)gtk_menu_item_new_with_mnemonic(Str.toStringz(label)) 
+p = cast(GtkMenuItem*)gtk_menu_item_new_with_mnemonic(Str.toStringz(label)
-        }
-        else
-        {
-            // GtkWidget* gtk_menu_item_new_with_label (const gchar *label);
-
-
+
+
+
+
+
+
+
+
+
+
-        setName(label);
-    }

trunk/src/gtk/MenuToolButton.d

@@ -137 +137 @@
-     *  iconWidget = a widget that will be used as icon widget, or NULL
-     *  label = a string that will be used as label, or NULL
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this(Widget iconWidget, string label)
-    {
-        // GtkToolItem* gtk_menu_tool_button_new (GtkWidget *icon_widget,  const gchar *label);
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -154 +160 @@
-     * Params:
-     * stockID = the name of a stock item
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this(StockID stockId)
-    {
-        // GtkToolItem* gtk_menu_tool_button_new_from_stock  (const gchar *stock_id);
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -178 +190 @@
-        if(p is null)
-        {
-
-
+
-        }
-        return new Menu(cast(GtkMenu*)p);

trunk/src/gtk/MessageDialog.d

@@ -202 +202 @@
-     *  messageFormat = printf()-style format string, or NULL
-     *  message = the message - should be null, any formatting should be done prior to call this constructor
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (Window parent, GtkDialogFlags flags, GtkMessageType type, GtkButtonsType buttons, bool markup, string messageFormat, string message=null )
-    {
+        GtkMessageDialog* p;
+        
-        if ( markup )
-        {
-            // GtkWidget* gtk_message_dialog_new_with_markup  (GtkWindow *parent,  GtkDialogFlags flags,  GtkMessageType type,  GtkButtonsType buttons,  const gchar *message_format,  ...);
-
-
+
-            parent is null ? null : parent.getWindowStruct(),
-            flags,
@@ -217 +219 @@
-            Str.toStringz(message), // this should be null
-            null
-            )
-            );
-        }
@@ -223 +224 @@
-        {
-            // GtkWidget* gtk_message_dialog_new (GtkWindow *parent,  GtkDialogFlags flags,  GtkMessageType type,  GtkButtonsType buttons,  const gchar *message_format,  ...);
-
-
+
-            parent is null ? null : parent.getWindowStruct(),
-            flags,
@@ -232 +232 @@
-            Str.toStringz(message), // this should be null
-            null
-            )
-            );
-        }
+        
+        if(p is null)
+        {
+            throw new ConstructionException("null returned by gtk_button_new()");
+        }
+        
+        this(p);
-    }
-    

trunk/src/gtk/RadioButton.d

@@ -170 +170 @@
-     *  gtk_label_new_with_mnemonic(), so underscores in label indicate the
-     *  mnemonic for the button.
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (ListSG group, string label, bool mnemonic=true)
-    {
+        GtkRadioButton* p;
+        
-        if ( mnemonic )
-        {
-            // GtkWidget* gtk_radio_button_new_with_mnemonic  (GSList *group,  const gchar *label);
-this(
+p = 
-            group is null ? null : group.getListSGStruct(),
-
-
+
-        }
-        else
-        {
-            // GtkWidget* gtk_radio_button_new_with_label (GSList *group,  const gchar *label);
-this(
+p = 
-            group is null ? null : group.getListSGStruct(),
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -200 +208 @@
-     *  will be created using gtk_label_new_with_mnemonic(), so underscores
-     *  in label indicate the mnemonic for the button.
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (RadioButton radioButton, string label, bool mnemonic=true)
-    {
+        GtkRadioButton* p;
+        
-        if ( mnemonic )
-        {
-            // GtkWidget* gtk_radio_button_new_with_mnemonic_from_widget  (GtkRadioButton *group,  const gchar *label);
-this(
+p = 
-            radioButton.getRadioButtonStruct(),
-
-
+
-        }
-        else
-        {
-            // GtkWidget* gtk_radio_button_new_with_label_from_widget  (GtkRadioButton *group,  const gchar *label);
-this(
+p = 
-            radioButton.getRadioButtonStruct(),
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-    

trunk/src/gtk/RadioMenuItem.d

@@ -144 +144 @@
-     *  group = an existing GtkRadioMenuItem
-     *  label = the text for the label
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (RadioMenuItem radioMenuItem, string label, bool mnemonic=true)
-    {
+        GtkRadioMenuItem* p;
+        
-        if ( mnemonic )
-        {
-            // GtkWidget* gtk_radio_menu_item_new_with_mnemonic_from_widget  (GtkRadioMenuItem *group,  const gchar *label);
-this(
- )
+p = 
+
-        }
-        else
-        {
-            // GtkWidget* gtk_radio_menu_item_new_with_label_from_widget  (GtkRadioMenuItem *group,  const gchar *label);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -182 +179 @@
-     *  will be created using gtk_label_new_with_mnemonic(), so underscores
-     *  in label indicate the mnemonic for the menu item.
+     * Throws: ConstructionException GTK+ fails to create the object.
-     */
-    public this (ListSG group, string label, bool mnemonic=true)
-    {
+        GtkRadioMenuItem* p;
+        
-        if ( mnemonic )
-        {
-            // GtkWidget* gtk_radio_menu_item_new_with_mnemonic  (GSList *group,  const gchar *