Author: danw
Date: 2005-03-08 08:53:41 -0500 (Tue, 08 Mar 2005)
New Revision: 41568

Modified:
   trunk/stetic/ChangeLog
   trunk/stetic/libstetic/GladeUtils.cs
   trunk/stetic/libstetic/ObjectWrapper.cs
   trunk/stetic/libstetic/wrapper/Bin.cs
   trunk/stetic/libstetic/wrapper/Box.cs
   trunk/stetic/libstetic/wrapper/Button.cs
   trunk/stetic/libstetic/wrapper/ButtonBox.cs
   trunk/stetic/libstetic/wrapper/CheckButton.cs
   trunk/stetic/libstetic/wrapper/ComboBox.cs
   trunk/stetic/libstetic/wrapper/Container.cs
   trunk/stetic/libstetic/wrapper/Dialog.cs
   trunk/stetic/libstetic/wrapper/Entry.cs
   trunk/stetic/libstetic/wrapper/Expander.cs
   trunk/stetic/libstetic/wrapper/Frame.cs
   trunk/stetic/libstetic/wrapper/Image.cs
   trunk/stetic/libstetic/wrapper/Label.cs
   trunk/stetic/libstetic/wrapper/MenuItem.cs
   trunk/stetic/libstetic/wrapper/MessageDialog.cs
   trunk/stetic/libstetic/wrapper/Notebook.cs
   trunk/stetic/libstetic/wrapper/Object.cs
   trunk/stetic/libstetic/wrapper/OptionMenu.cs
   trunk/stetic/libstetic/wrapper/Paned.cs
   trunk/stetic/libstetic/wrapper/RadioButton.cs
   trunk/stetic/libstetic/wrapper/Range.cs
   trunk/stetic/libstetic/wrapper/Scale.cs
   trunk/stetic/libstetic/wrapper/ScrolledWindow.cs
   trunk/stetic/libstetic/wrapper/Table.cs
   trunk/stetic/libstetic/wrapper/TextView.cs
   trunk/stetic/libstetic/wrapper/ToggleButton.cs
   trunk/stetic/libstetic/wrapper/Widget.cs
   trunk/stetic/libstetic/wrapper/Window.cs
   trunk/stetic/stetic/GladeImport.cs
Log:
        * libstetic/GladeUtils.cs (ExtractProperty, CreateWidget,
        SetProps, SetPacking): Make these all take a Hashtable of
        propname->value rather than a pair of ArrayLists.

        * libstetic/ObjectWrapper.cs (Wrap): make this public
        (GladeImport): take a Hashtable rather than ArrayLists
        
        * libstetic/wrapper/*.cs:
        * stetic/GladeImport.cs: update for those


Modified: trunk/stetic/ChangeLog
===================================================================
--- trunk/stetic/ChangeLog      2005-03-08 13:48:47 UTC (rev 41567)
+++ trunk/stetic/ChangeLog      2005-03-08 13:53:41 UTC (rev 41568)
@@ -1,3 +1,15 @@
+2005-03-08  Dan Winship  <[EMAIL PROTECTED]>
+
+       * libstetic/GladeUtils.cs (ExtractProperty, CreateWidget,
+       SetProps, SetPacking): Make these all take a Hashtable of
+       propname->value rather than a pair of ArrayLists.
+
+       * libstetic/ObjectWrapper.cs (Wrap): make this public
+       (GladeImport): take a Hashtable rather than ArrayLists
+       
+       * libstetic/wrapper/*.cs:
+       * stetic/GladeImport.cs: update for those
+
 2005-03-03  Todd Berman  <[EMAIL PROTECTED]>
 
        * stetic/Stetic.cs: Add a ShadowType.In to the widget TreeView.

Modified: trunk/stetic/libstetic/GladeUtils.cs
===================================================================
--- trunk/stetic/libstetic/GladeUtils.cs        2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/GladeUtils.cs        2005-03-08 13:53:41 UTC (rev 
41568)
@@ -6,15 +6,11 @@
 
        public static class GladeUtils {
 
-               public static string ExtractProperty (string name, ArrayList 
propNames, ArrayList propVals)
+               public static string ExtractProperty (string name, Hashtable 
props)
                {
-                       int index = propNames.IndexOf (name);
-                       if (index == -1)
-                               return null;
-
-                       string value = propVals[index] as string;
-                       propNames.RemoveAt (index);
-                       propVals.RemoveAt (index);
+                       string value = props[name] as string;
+                       if (value != null)
+                               props.Remove (name);
                        return value;
                }
 
@@ -71,22 +67,24 @@
                        return true;
                }
 
-               static void HydrateProperties (IntPtr gtype, bool childprops, 
ArrayList names, ArrayList strvals, out ArrayList values)
+               static void HydrateProperties (IntPtr gtype, bool childprops, 
Hashtable props,
+                                              out string[] propNames, out 
GLib.Value[] propVals)
                {
-                       values = new ArrayList ();
+                       ArrayList names = new ArrayList ();
+                       ArrayList values = new ArrayList ();
 
-                       int i = 0;
-                       while (i < names.Count) {
-                               GLib.Value value;
+                       foreach (string name in props.Keys) {
+                               string strval = props[name] as string;
 
-                               if (Hydrate (gtype, childprops, names[i] as 
string, strvals[i] as string, out value)) {
+                               GLib.Value value;
+                               if (Hydrate (gtype, childprops, name, strval, 
out value)) {
+                                       names.Add (name);
                                        values.Add (value);
-                                       i++;
-                               } else {
-                                       names.RemoveAt (i);
-                                       strvals.RemoveAt (i);
                                }
                        }
+
+                       propNames = (string[])names.ToArray (typeof (string));
+                       propVals = (GLib.Value[])values.ToArray (typeof 
(GLib.Value));
                }
 
                [DllImport("libgobject-2.0-0.dll")]
@@ -98,17 +96,15 @@
                [DllImport("libgtk-win32-2.0-0.dll")]
                static extern void gtk_object_sink (IntPtr raw);
 
-               static public Gtk.Widget CreateWidget (string className, 
ArrayList propNames, ArrayList propStrVals)
+               static public Gtk.Widget CreateWidget (string className, 
Hashtable props)
                {
                        IntPtr gtype = g_type_from_name (className);
 
-                       ArrayList propVals;
-                       HydrateProperties (gtype, false, propNames, 
propStrVals, out propVals);
+                       string[] propNames;
+                       GLib.Value[] propVals;
+                       HydrateProperties (gtype, false, props, out propNames, 
out propVals);
 
-                       string[] propNamesArray = (string[])propNames.ToArray 
(typeof (string));
-                       GLib.Value[] propValsArray = 
(GLib.Value[])propVals.ToArray (typeof (GLib.Value));
-
-                       IntPtr raw = gtksharp_object_newv (gtype, 
propNamesArray.Length, propNamesArray, propValsArray);
+                       IntPtr raw = gtksharp_object_newv (gtype, 
propNames.Length, propNames, propVals);
                        if (raw == IntPtr.Zero) {
                                Console.WriteLine ("Could not create widget of 
type {0}", className);
                                return null;
@@ -129,25 +125,26 @@
                [DllImport("libgobject-2.0-0.dll")]
                static extern void g_object_set_property (IntPtr obj, string 
name, ref GLib.Value val);
 
-               static public void SetProps (Gtk.Widget widget, ArrayList 
propNames, ArrayList propStrVals)
+               static public void SetProps (Gtk.Widget widget, Hashtable props)
                {
-                       ArrayList propVals;
-                       HydrateProperties (gtksharp_get_type_id 
(widget.Handle), false, propNames, propStrVals, out propVals);
+                       string[] propNames;
+                       GLib.Value[] propVals;
+                       HydrateProperties (gtksharp_get_type_id 
(widget.Handle), false, props,
+                                          out propNames, out propVals);
 
-                       for (int i = 0; i < propNames.Count; i++) {
-                               GLib.Value value = (GLib.Value)propVals[i];
-                               g_object_set_property (widget.Handle, 
(string)propNames[i], ref value);
-                       }
+                       for (int i = 0; i < propNames.Length; i++)
+                               g_object_set_property (widget.Handle, 
propNames[i], ref propVals[i]);
                }
 
-               static public void SetPacking (Gtk.Container parent, Gtk.Widget 
child,
-                                              ArrayList propNames, ArrayList 
propStrVals)
+               static public void SetPacking (Gtk.Container parent, Gtk.Widget 
child, Hashtable childprops)
                {
-                       ArrayList propVals;
-                       HydrateProperties (gtksharp_get_type_id 
(parent.Handle), true, propNames, propStrVals, out propVals);
+                       string[] propNames;
+                       GLib.Value[] propVals;
+                       HydrateProperties (gtksharp_get_type_id 
(parent.Handle), true, childprops,
+                                          out propNames, out propVals);
 
-                       for (int i = 0; i < propNames.Count; i++)
-                               parent.ChildSetProperty (child, 
(string)propNames[i], (GLib.Value)propVals[i]);
+                       for (int i = 0; i < propNames.Length; i++)
+                               parent.ChildSetProperty (child, propNames[i], 
propVals[i]);
                }
        }
 }

Modified: trunk/stetic/libstetic/ObjectWrapper.cs
===================================================================
--- trunk/stetic/libstetic/ObjectWrapper.cs     2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/ObjectWrapper.cs     2005-03-08 13:53:41 UTC (rev 
41568)
@@ -9,7 +9,7 @@
                protected IStetic stetic;
                protected object wrapped;
 
-               protected virtual void Wrap (object obj, bool initialized)
+               public virtual void Wrap (object obj, bool initialized)
                {
                        this.wrapped = obj;
                        wrappers[obj] = this;
@@ -105,7 +105,7 @@
                        return Create (stetic, type, wrapped);
                }
 
-               public static ObjectWrapper GladeImport (IStetic stetic, string 
className, string id, ArrayList propNames, ArrayList propVals)
+               public static ObjectWrapper GladeImport (IStetic stetic, string 
className, string id, Hashtable props)
                {
                        Type type = (Type)wrapperTypes[className];
                        if (type == null)
@@ -119,7 +119,7 @@
                        if (wrapper == null)
                                return null;
                        wrapper.stetic = stetic;
-                       info.Invoke (wrapper, new object[] { className, id, 
propNames, propVals });
+                       info.Invoke (wrapper, new object[] { className, id, 
props });
                        return wrapper;
                }
 

Modified: trunk/stetic/libstetic/wrapper/Bin.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Bin.cs       2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Bin.cs       2005-03-08 13:53:41 UTC (rev 
41568)
@@ -15,7 +15,7 @@
                        }
                }
                
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
 

Modified: trunk/stetic/libstetic/wrapper/Box.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Box.cs       2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Box.cs       2005-03-08 13:53:41 UTC (rev 
41568)
@@ -19,7 +19,7 @@
                                             "InsertAfter");
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        if (!initialized) {

Modified: trunk/stetic/libstetic/wrapper/Button.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Button.cs    2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Button.cs    2005-03-08 13:53:41 UTC (rev 
41568)
@@ -56,7 +56,7 @@
                        return new Gtk.Button (Gtk.Stock.Ok);
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        if (!initialized) {

Modified: trunk/stetic/libstetic/wrapper/ButtonBox.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/ButtonBox.cs 2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/ButtonBox.cs 2005-03-08 13:53:41 UTC (rev 
41568)
@@ -33,24 +33,17 @@
                        }
                }
 
-               public override Widget GladeImportChild (string className, 
string id,
-                                                        ArrayList propNames, 
ArrayList propVals,
-                                                        ArrayList 
packingNames, ArrayList packingVals)
+               public override Widget GladeImportChild (string className, 
string id, Hashtable props, Hashtable childprops)
                {
                        Gtk.ResponseType response = 0;
 
-                       int index = propNames.IndexOf ("response_id");
-                       if (index != -1) {
-                               string response_id = propVals[index] as string;
-                               propNames.RemoveAt (index);
-                               propVals.RemoveAt (index);
-
+                       string response_id = props["response_id"] as string;
+                       if (response_id != null) {
+                               props.Remove ("response_id");
                                response = (Gtk.ResponseType)Int32.Parse 
(response_id);
                        }
 
-                       Widget wrapper = base.GladeImportChild (className, id,
-                                                               propNames, 
propVals,
-                                                               packingNames, 
packingVals);
+                       Widget wrapper = base.GladeImportChild (className, id, 
props, childprops);
 
                        if (response == Gtk.ResponseType.Help) {
                                Gtk.ButtonBox.ButtonBoxChild bbc = 
((Gtk.Container)Wrapped)[((Gtk.Widget)wrapper.Wrapped).Parent] as 
Gtk.ButtonBox.ButtonBoxChild;

Modified: trunk/stetic/libstetic/wrapper/CheckButton.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/CheckButton.cs       2005-03-08 13:48:47 UTC 
(rev 41567)
+++ trunk/stetic/libstetic/wrapper/CheckButton.cs       2005-03-08 13:53:41 UTC 
(rev 41568)
@@ -16,7 +16,7 @@
                                      "DrawIndicator");
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        if (!initialized) {

Modified: trunk/stetic/libstetic/wrapper/ComboBox.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/ComboBox.cs  2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/ComboBox.cs  2005-03-08 13:53:41 UTC (rev 
41568)
@@ -24,11 +24,11 @@
                        return Gtk.ComboBox.NewText ();
                }
 
-               protected override void GladeImport (string className, string 
id, ArrayList propNames, ArrayList propVals)
+               protected override void GladeImport (string className, string 
id, Hashtable props)
                {
                        Gtk.ComboBox combobox = CreateInstance ();
-                       string items = GladeUtils.ExtractProperty ("items", 
propNames, propVals);
-                       GladeUtils.SetProps (combobox, propNames, propVals);
+                       string items = GladeUtils.ExtractProperty ("items", 
props);
+                       GladeUtils.SetProps (combobox, props);
                        combobox.Name = id;
                        Wrap (combobox, true);
                        Items = items;

Modified: trunk/stetic/libstetic/wrapper/Container.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Container.cs 2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Container.cs 2005-03-08 13:53:41 UTC (rev 
41568)
@@ -40,17 +40,16 @@
                        }
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        container.Removed += SiteRemoved;
                }
 
                public virtual Widget GladeImportChild (string className, 
string id,
-                                                       ArrayList propNames, 
ArrayList propVals,
-                                                       ArrayList packingNames, 
ArrayList packingVals)
+                                                       Hashtable props, 
Hashtable childprops)
                {
-                       ObjectWrapper wrapper = 
Stetic.ObjectWrapper.GladeImport (stetic, className, id, propNames, propVals);
+                       ObjectWrapper wrapper = 
Stetic.ObjectWrapper.GladeImport (stetic, className, id, props);
                        if (wrapper == null)
                                return null;
 
@@ -64,7 +63,7 @@
                        } else
                                container.Add (child);
 
-                       GladeUtils.SetPacking (container, child, packingNames, 
packingVals);
+                       GladeUtils.SetPacking (container, child, childprops);
                        return (Widget)wrapper;
                }
 
@@ -105,14 +104,14 @@
                }
 
                public virtual Widget GladeSetInternalChild (string childName, 
string className, string id,
-                                                            ArrayList 
propNames, ArrayList propVals)
+                                                            Hashtable props)
                {
                        Gtk.Widget widget = FindInternalChild (childName);
                        if (widget == null)
                                return null;
 
                        widget.Name = id;
-                       GladeUtils.SetProps (widget, propNames, propVals);
+                       GladeUtils.SetProps (widget, props);
 
                        return (Widget) Stetic.ObjectWrapper.Create (stetic, 
className, widget);
                }
@@ -200,7 +199,7 @@
                                // FIXME?
                        }
 
-                       protected override void Wrap (object obj, bool 
initialized)
+                       public override void Wrap (object obj, bool initialized)
                        {
                                base.Wrap (obj, initialized);
                                cc.Child.ChildNotified += ChildNotifyHandler;

Modified: trunk/stetic/libstetic/wrapper/Dialog.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Dialog.cs    2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Dialog.cs    2005-03-08 13:53:41 UTC (rev 
41568)
@@ -27,7 +27,7 @@
                                      "SkipTaskbarHint");
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        WidgetSite site;
 

Modified: trunk/stetic/libstetic/wrapper/Entry.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Entry.cs     2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Entry.cs     2005-03-08 13:53:41 UTC (rev 
41568)
@@ -23,18 +23,17 @@
                                      "Xalign");
                }
 
-               protected override void GladeImport (string className, string 
id, ArrayList propNames, ArrayList propVals)
+               protected override void GladeImport (string className, string 
id, Hashtable props)
                {
-                       int index = propNames.IndexOf ("invisible_char");
-                       if (index != -1) {
+                       string invisible_char = props["invisible_char"] as 
string;
+                       if (invisible_char != null) {
                                // invisible_char is a guint, but glade
                                // serializes it as a string, so we have
                                // to translate it
-                               string val = propVals[index] as string;
-                               propVals[index] = ((int)val[0]).ToString ();
+                               props["invisible_char"] = 
((int)invisible_char[0]).ToString ();
                        }
 
-                       base.GladeImport (className, id, propNames, propVals);
+                       base.GladeImport (className, id, props);
                }
        }
 }

Modified: trunk/stetic/libstetic/wrapper/Expander.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Expander.cs  2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Expander.cs  2005-03-08 13:53:41 UTC (rev 
41568)
@@ -24,7 +24,7 @@
                        return new Gtk.Expander ("");
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
 
@@ -36,24 +36,17 @@
                        };
                }
 
-               public override Widget GladeImportChild (string className, 
string id,
-                                                        ArrayList propNames, 
ArrayList propVals,
-                                                        ArrayList 
packingNames, ArrayList packingVals)
+               public override Widget GladeImportChild (string className, 
string id, Hashtable props, Hashtable childprops)
                {
-                       if (packingNames.Count == 1 &&
-                           (string)packingNames[0] == "type" &&
-                           (string)packingVals[0] == "label_item") {
-                               ObjectWrapper wrapper = 
Stetic.ObjectWrapper.GladeImport (stetic, className, id, propNames, propVals);
+                       if (childprops.Count == 1 && 
((string)childprops["type"]) == "label_item") {
+                               ObjectWrapper wrapper = 
Stetic.ObjectWrapper.GladeImport (stetic, className, id, props);
                                WidgetSite site = CreateWidgetSite ();
                                site.Add ((Gtk.Widget)wrapper.Wrapped);
 
                                expander.LabelWidget = site;
                                return (Widget)wrapper;
-                       } else {
-                               return base.GladeImportChild (className, id,
-                                                             propNames, 
propVals,
-                                                             packingNames, 
packingVals);
-                       }
+                       } else
+                               return base.GladeImportChild (className, id, 
props, childprops);
                }
 
                Gtk.Expander expander {

Modified: trunk/stetic/libstetic/wrapper/Frame.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Frame.cs     2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Frame.cs     2005-03-08 13:53:41 UTC (rev 
41568)
@@ -19,7 +19,7 @@
                                      "BorderWidth");
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        if (!initialized) {
@@ -28,25 +28,18 @@
                        }
                }
 
-               public override Widget GladeImportChild (string className, 
string id,
-                                                        ArrayList propNames, 
ArrayList propVals,
-                                                        ArrayList 
packingNames, ArrayList packingVals)
+               public override Widget GladeImportChild (string className, 
string id, Hashtable props, Hashtable childprops)
                {
-                       if (packingNames.Count == 1 &&
-                           (string)packingNames[0] == "type" &&
-                           (string)packingVals[0] == "label_item") {
-                               ObjectWrapper wrapper = 
Stetic.ObjectWrapper.GladeImport (stetic, className, id, propNames, propVals);
+                       if (childprops.Count == 1 && 
((string)childprops["type"]) == "label_item") {
+                               ObjectWrapper wrapper = 
Stetic.ObjectWrapper.GladeImport (stetic, className, id, props);
                                WidgetSite site = CreateWidgetSite ();
                                site.Add ((Gtk.Widget)wrapper.Wrapped);
 
                                Gtk.Frame frame = (Gtk.Frame)Wrapped;
                                frame.LabelWidget = site;
                                return (Widget)wrapper;
-                       } else {
-                               return base.GladeImportChild (className, id,
-                                                             propNames, 
propVals,
-                                                             packingNames, 
packingVals);
-                       }
+                       } else
+                               return base.GladeImportChild (className, id, 
props, childprops);
                }
        }
 }

Modified: trunk/stetic/libstetic/wrapper/Image.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Image.cs     2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Image.cs     2005-03-08 13:53:41 UTC (rev 
41568)
@@ -27,7 +27,7 @@
 
                static Gdk.Pixbuf missing = Gdk.Pixbuf.LoadFromResource 
("missing.png");
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        useStock = (image.StorageType == Gtk.ImageType.Stock);

Modified: trunk/stetic/libstetic/wrapper/Label.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Label.cs     2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Label.cs     2005-03-08 13:53:41 UTC (rev 
41568)
@@ -27,7 +27,7 @@
                        Wrap (new Gtk.Label (text), false);
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        if (!initialized) {
@@ -38,12 +38,12 @@
 
                string mnemonic_widget;
 
-               protected override void GladeImport (string className, string 
id, ArrayList propNames, ArrayList propVals)
+               protected override void GladeImport (string className, string 
id, Hashtable props)
                {
-                       mnemonic_widget = GladeUtils.ExtractProperty 
("mnemonic_widget", propNames, propVals);
+                       mnemonic_widget = GladeUtils.ExtractProperty 
("mnemonic_widget", props);
                        if (mnemonic_widget != null)
                                stetic.GladeImportComplete += SetMnemonicWidget;
-                       base.GladeImport (className, id, propNames, propVals);
+                       base.GladeImport (className, id, props);
                }
 
                void SetMnemonicWidget ()

Modified: trunk/stetic/libstetic/wrapper/MenuItem.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/MenuItem.cs  2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/MenuItem.cs  2005-03-08 13:53:41 UTC (rev 
41568)
@@ -8,11 +8,11 @@
 
                public static new Type WrappedType = typeof (Gtk.MenuItem);
 
-               protected override void GladeImport (string className, string 
id, ArrayList propNames, ArrayList propVals)
+               protected override void GladeImport (string className, string 
id, Hashtable props)
                {
-                       string label = GladeUtils.ExtractProperty ("label", 
propNames, propVals);
-                       string use_underline = GladeUtils.ExtractProperty 
("use_underline", propNames, propVals);
-                       base.GladeImport (className, id, propNames, propVals);
+                       string label = GladeUtils.ExtractProperty ("label", 
props);
+                       string use_underline = GladeUtils.ExtractProperty 
("use_underline", props);
+                       base.GladeImport (className, id, props);
 
                        if (label != null) {
                                Gtk.MenuItem item = (Gtk.MenuItem)Wrapped;

Modified: trunk/stetic/libstetic/wrapper/MessageDialog.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/MessageDialog.cs     2005-03-08 13:48:47 UTC 
(rev 41567)
+++ trunk/stetic/libstetic/wrapper/MessageDialog.cs     2005-03-08 13:53:41 UTC 
(rev 41568)
@@ -29,7 +29,7 @@
                        return new Gtk.Dialog ();
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        if (!initialized) {

Modified: trunk/stetic/libstetic/wrapper/Notebook.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Notebook.cs  2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Notebook.cs  2005-03-08 13:53:41 UTC (rev 
41568)
@@ -35,21 +35,17 @@
 
                ArrayList tabs = new ArrayList ();
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        if (!initialized)
                                InsertPage (0);
                }
 
-               public override Widget GladeImportChild (string className, 
string id,
-                                                        ArrayList propNames, 
ArrayList propVals,
-                                                        ArrayList 
packingNames, ArrayList packingVals)
+               public override Widget GladeImportChild (string className, 
string id, Hashtable props, Hashtable childprops)
                {
-                       if (packingNames.Count == 1 &&
-                           (string)packingNames[0] == "type" &&
-                           (string)packingVals[0] == "tab") {
-                               ObjectWrapper wrapper = 
Stetic.ObjectWrapper.GladeImport (stetic, className, id, propNames, propVals);
+                       if (childprops.Count == 1 && 
((string)childprops["type"]) == "tab") {
+                               ObjectWrapper wrapper = 
Stetic.ObjectWrapper.GladeImport (stetic, className, id, props);
                                WidgetSite site = CreateWidgetSite ();
                                site.Selected += LabelSelected;
                                site.Add ((Gtk.Widget)wrapper.Wrapped);
@@ -57,11 +53,8 @@
                                notebook.SetTabLabel (notebook.GetNthPage 
(notebook.NPages - 1), site);
                                tabs.Add (site);
                                return (Widget)wrapper;
-                       } else {
-                               return base.GladeImportChild (className, id,
-                                                             propNames, 
propVals,
-                                                             packingNames, 
packingVals);
-                       }
+                       } else
+                               return base.GladeImportChild (className, id, 
props, childprops);
                }
 
                private Gtk.Notebook notebook {

Modified: trunk/stetic/libstetic/wrapper/Object.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Object.cs    2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Object.cs    2005-03-08 13:53:41 UTC (rev 
41568)
@@ -4,7 +4,7 @@
 namespace Stetic.Wrapper {
        public abstract class Object : Stetic.ObjectWrapper {
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        ((GLib.Object)Wrapped).AddNotification (NotifyHandler);

Modified: trunk/stetic/libstetic/wrapper/OptionMenu.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/OptionMenu.cs        2005-03-08 13:48:47 UTC 
(rev 41567)
+++ trunk/stetic/libstetic/wrapper/OptionMenu.cs        2005-03-08 13:53:41 UTC 
(rev 41568)
@@ -18,7 +18,7 @@
                                      "Active");
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        if (optionmenu.Menu == null) {
@@ -28,18 +28,18 @@
                        }
                }
 
-               protected override void GladeImport (string className, string 
id, ArrayList propNames, ArrayList propVals)
+               protected override void GladeImport (string className, string 
id, Hashtable props)
                {
-                       GladeUtils.ExtractProperty ("history", propNames, 
propVals);
-                       base.GladeImport (className, id, propNames, propVals);
+                       GladeUtils.ExtractProperty ("history", props);
+                       base.GladeImport (className, id, props);
                        stetic.GladeImportComplete += FlattenMenu;
                }
 
                public override Widget GladeImportChild (string className, 
string id,
-                                                        ArrayList propNames, 
ArrayList propVals,
-                                                        ArrayList 
packingNames, ArrayList packingVals)
+                                                        Hashtable props,
+                                                        Hashtable childprops)
                {
-                       ObjectWrapper wrapper = 
Stetic.ObjectWrapper.GladeImport (stetic, className, id, propNames, propVals);
+                       ObjectWrapper wrapper = 
Stetic.ObjectWrapper.GladeImport (stetic, className, id, props);
                        if (wrapper == null)
                                return null;
 

Modified: trunk/stetic/libstetic/wrapper/Paned.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Paned.cs     2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Paned.cs     2005-03-08 13:53:41 UTC (rev 
41568)
@@ -14,7 +14,7 @@
                                      "BorderWidth");
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        if (!initialized) {

Modified: trunk/stetic/libstetic/wrapper/RadioButton.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/RadioButton.cs       2005-03-08 13:48:47 UTC 
(rev 41567)
+++ trunk/stetic/libstetic/wrapper/RadioButton.cs       2005-03-08 13:53:41 UTC 
(rev 41568)
@@ -27,7 +27,7 @@
                        return new Gtk.RadioButton ("");
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        if (!initialized) {
@@ -45,10 +45,10 @@
 
                string group;
 
-               protected override void GladeImport (string className, string 
id, ArrayList propNames, ArrayList propVals)
+               protected override void GladeImport (string className, string 
id, Hashtable props)
                {
-                       group = GladeUtils.ExtractProperty ("group", propNames, 
propVals);
-                       base.GladeImport (className, id, propNames, propVals);
+                       group = GladeUtils.ExtractProperty ("group", props);
+                       base.GladeImport (className, id, props);
 
                        if (group != null)
                                stetic.GladeImportComplete += SetGroup;

Modified: trunk/stetic/libstetic/wrapper/Range.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Range.cs     2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Range.cs     2005-03-08 13:53:41 UTC (rev 
41568)
@@ -20,7 +20,7 @@
                                      "Adjustment.Value");
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        ((Gtk.Range)Wrapped).Adjustment.AddNotification 
(AdjustmentNotifyHandler);

Modified: trunk/stetic/libstetic/wrapper/Scale.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Scale.cs     2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Scale.cs     2005-03-08 13:53:41 UTC (rev 
41568)
@@ -20,7 +20,7 @@
                        props["ValuePos"].DependsOn (props["DrawValue"]);
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        ((Gtk.Scale)Wrapped).Adjustment.AddNotification 
(AdjustmentNotifyHandler);

Modified: trunk/stetic/libstetic/wrapper/ScrolledWindow.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/ScrolledWindow.cs    2005-03-08 13:48:47 UTC 
(rev 41567)
+++ trunk/stetic/libstetic/wrapper/ScrolledWindow.cs    2005-03-08 13:53:41 UTC 
(rev 41568)
@@ -18,7 +18,7 @@
                                      "BorderWidth");
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        if (!initialized) {

Modified: trunk/stetic/libstetic/wrapper/Table.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Table.cs     2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Table.cs     2005-03-08 13:53:41 UTC (rev 
41568)
@@ -35,34 +35,27 @@
                        return new Gtk.Table (3, 3, false);
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        Sync ();
                }
 
-               protected override void GladeImport (string className, string 
id, ArrayList propNames, ArrayList propVals)
+               protected override void GladeImport (string className, string 
id, Hashtable props)
                {
                        stetic.GladeImportComplete += DoSync;
-                       base.GladeImport (className, id, propNames, propVals);
+                       base.GladeImport (className, id, props);
                }
 
                public override Widget GladeImportChild (string className, 
string id,
-                                                        ArrayList propNames, 
ArrayList propVals,
-                                                        ArrayList 
packingNames, ArrayList packingVals)
+                                                        Hashtable props, 
Hashtable childprops)
                {
-                       if (packingNames.IndexOf ("x_options") == -1) {
-                               packingNames.Add ("x_options");
-                               packingVals.Add ("expand|fill");
-                       }
-                       if (packingNames.IndexOf ("y_options") == -1) {
-                               packingNames.Add ("y_options");
-                               packingVals.Add ("expand|fill");
-                       }
+                       if (childprops["x_options"] == null)
+                               childprops["x_options"] = "expand|fill";
+                       if (childprops["y_options"] == null)
+                               childprops["y_options"] = "expand|fill";
 
-                       return base.GladeImportChild (className, id,
-                                                     propNames, propVals,
-                                                     packingNames, 
packingVals);
+                       return base.GladeImportChild (className, id, props, 
childprops);
                }
 
                void DoSync ()

Modified: trunk/stetic/libstetic/wrapper/TextView.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/TextView.cs  2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/TextView.cs  2005-03-08 13:53:41 UTC (rev 
41568)
@@ -27,16 +27,16 @@
                                      "Indent");
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        ((Gtk.TextView)Wrapped).Buffer.Changed += 
Buffer_Changed;
                }
 
-               protected override void GladeImport (string className, string 
id, ArrayList propNames, ArrayList propVals)
+               protected override void GladeImport (string className, string 
id, Hashtable props)
                {
-                       string text = GladeUtils.ExtractProperty ("text", 
propNames, propVals);
-                       base.GladeImport (className, id, propNames, propVals);
+                       string text = GladeUtils.ExtractProperty ("text", 
props);
+                       base.GladeImport (className, id, props);
                        Text = text;
                }
 

Modified: trunk/stetic/libstetic/wrapper/ToggleButton.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/ToggleButton.cs      2005-03-08 13:48:47 UTC 
(rev 41567)
+++ trunk/stetic/libstetic/wrapper/ToggleButton.cs      2005-03-08 13:53:41 UTC 
(rev 41568)
@@ -19,7 +19,7 @@
                        props["Label"].DependsInverselyOn (props["UseStock"]);
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
                        if (!initialized) {

Modified: trunk/stetic/libstetic/wrapper/Widget.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Widget.cs    2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Widget.cs    2005-03-08 13:53:41 UTC (rev 
41568)
@@ -25,7 +25,7 @@
 
                static Hashtable counters = new Hashtable ();
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        base.Wrap (obj, initialized);
 
@@ -42,11 +42,11 @@
                        counters[type] = (int)counters[type] + 1;
                }
 
-               protected virtual void GladeImport (string className, string 
id, ArrayList propNames, ArrayList propVals)
+               protected virtual void GladeImport (string className, string 
id, Hashtable props)
                {
-                       string visible = GladeUtils.ExtractProperty ("visible", 
propNames, propVals);
-                       string has_default = GladeUtils.ExtractProperty 
("has_default", propNames, propVals);
-                       Gtk.Widget widget = GladeUtils.CreateWidget (className, 
propNames, propVals);
+                       string visible = GladeUtils.ExtractProperty ("visible", 
props);
+                       string has_default = GladeUtils.ExtractProperty 
("has_default", props);
+                       Gtk.Widget widget = GladeUtils.CreateWidget (className, 
props);
                        widget.Name = id;
                        Wrap (widget, true);
 

Modified: trunk/stetic/libstetic/wrapper/Window.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Window.cs    2005-03-08 13:48:47 UTC (rev 
41567)
+++ trunk/stetic/libstetic/wrapper/Window.cs    2005-03-08 13:53:41 UTC (rev 
41568)
@@ -42,7 +42,7 @@
                        return new Gtk.Window (Gtk.WindowType.Toplevel);
                }
 
-               protected override void Wrap (object obj, bool initialized)
+               public override void Wrap (object obj, bool initialized)
                {
                        Gtk.Window window = (Gtk.Window)obj;
 
@@ -61,12 +61,12 @@
                        window.DeleteEvent += DeleteEvent;
                }
 
-               protected override void GladeImport (string className, string 
id, ArrayList propNames, ArrayList propVals)
+               protected override void GladeImport (string className, string 
id, Hashtable props)
                {
-                       string modal = GladeUtils.ExtractProperty ("modal", 
propNames, propVals);
-                       string type_hint = GladeUtils.ExtractProperty 
("type_hint", propNames, propVals);
-                       string type = GladeUtils.ExtractProperty ("type", 
propNames, propVals);
-                       base.GladeImport (className, id, propNames, propVals);
+                       string modal = GladeUtils.ExtractProperty ("modal", 
props);
+                       string type_hint = GladeUtils.ExtractProperty 
("type_hint", props);
+                       string type = GladeUtils.ExtractProperty ("type", 
props);
+                       base.GladeImport (className, id, props);
                        Modal = (modal == "True");
 
                        if (type_hint != null && type_hint.StartsWith 
("GDK_WINDOW_TYPE_HINT_"))

Modified: trunk/stetic/stetic/GladeImport.cs
===================================================================
--- trunk/stetic/stetic/GladeImport.cs  2005-03-08 13:48:47 UTC (rev 41567)
+++ trunk/stetic/stetic/GladeImport.cs  2005-03-08 13:53:41 UTC (rev 41568)
@@ -69,23 +69,19 @@
                        string className = widget.Attributes["class"].Value;
                        string id = widget.Attributes["id"].Value;
 
-                       ArrayList propNames, propVals;
-                       ExtractProperties (widget.SelectNodes ("property"), out 
propNames, out propVals);
+                       Hashtable props;
+                       ExtractProperties (widget.SelectNodes ("property"), out 
props);
 
                        ObjectWrapper wrapper;
                        if (thischild == null) {
-                               wrapper = Stetic.ObjectWrapper.GladeImport 
(project, className, id, propNames, propVals);
+                               wrapper = Stetic.ObjectWrapper.GladeImport 
(project, className, id, props);
                        } else if (thischild.Attributes["internal-child"] != 
null) {
                                wrapper = parent.GladeSetInternalChild 
(thischild.Attributes["internal-child"].Value,
-                                                                       
className, id,
-                                                                       
propNames, propVals);
+                                                                       
className, id, props);
                        } else {
-                               ArrayList packingNames, packingVals;
-                               ExtractProperties (thischild.SelectNodes 
("packing/property"),
-                                                  out packingNames, out 
packingVals);
-                               wrapper = parent.GladeImportChild (className, 
id,
-                                                                  propNames, 
propVals,
-                                                                  
packingNames, packingVals);
+                               Hashtable childprops;
+                               ExtractProperties (thischild.SelectNodes 
("packing/property"), out childprops);
+                               wrapper = parent.GladeImportChild (className, 
id, props, childprops);
                        }
 
                        if (wrapper == null) {
@@ -108,14 +104,11 @@
                        return (Gtk.Widget)wrapper.Wrapped;
                }
 
-               static void ExtractProperties (XmlNodeList nodes, out ArrayList 
names, out ArrayList values)
+               static void ExtractProperties (XmlNodeList nodes, out Hashtable 
props)
                {
-                       names = new ArrayList ();
-                       values = new ArrayList ();
-                       foreach (XmlNode prop in nodes) {
-                               names.Add (prop.Attributes["name"].Value);
-                               values.Add (prop.InnerText);
-                       }
+                       props = new Hashtable ();
+                       foreach (XmlNode prop in nodes)
+                               props[prop.Attributes["name"].Value] = 
prop.InnerText;
                }
        }
 }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to