diff --git a/ChangeLog b/ChangeLog index ba4c5f2b1..ab9dd270b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2004-05-07 Mike Kestner + + * gtk/Gtk.metadata : map AccelLabel ctor parm to prop and hide + Adjustment ctor. + * gtk/Adjustment.custom : add set accessors for Upper/Lower and + implement ctor with subclassing. + * gtk/CheckMenuItem.custom : return from subclass branch. + * gtk/ImageMenuItem.custom : return from subclass branch. + * gtk/MenuItem.custom : return from subclass branch. + * gtk/RadioMenuItem.custom : return from subclass branch. + * gtk/glue/adjustment.c : add setters for lower/upper. + 2004-05-07 Mike Kestner * gtk/Gtk.metadata : hide some *MenuItem ctors. diff --git a/gtk/Adjustment.custom b/gtk/Adjustment.custom index 8e099508e..12993550b 100644 --- a/gtk/Adjustment.custom +++ b/gtk/Adjustment.custom @@ -4,6 +4,25 @@ // This code is inserted after the automatically generated code. // +[DllImport("libgtk-win32-2.0-0.dll")] +static extern IntPtr gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size); + +public Adjustment (double value, double lower, double upper, double step_increment, double page_increment, double page_size) : base (IntPtr.Zero) +{ + if (GetType () != typeof (Adjustment)) { + CreateNativeObject (new string [0], new GLib.Value [0]); + Value = value; + Lower = lower; + Upper = upper; + StepIncrement = step_increment; + PageIncrement = page_increment; + PageSize = page_size; + return; + } + + Raw = gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size); +} + [DllImport("gtksharpglue")] static extern void gtksharp_gtk_adjustment_set_bounds (IntPtr i, double lower, double upper, double step_increment, double page_increment, double page_size); @@ -20,18 +39,31 @@ public void SetBounds (double lower, double upper, double step_increment, double [DllImport ("gtksharpglue")] static extern double gtksharp_gtk_adjustment_get_lower (IntPtr i); +[DllImport ("gtksharpglue")] +static extern void gtksharp_gtk_adjustment_set_lower (IntPtr i, double lower); + public double Lower { get { return gtksharp_gtk_adjustment_get_lower (this.Handle); } + set { + gtksharp_gtk_adjustment_set_lower (Handle, value); + } } [DllImport ("gtksharpglue")] static extern double gtksharp_gtk_adjustment_get_upper (IntPtr i); + +[DllImport ("gtksharpglue")] +static extern void gtksharp_gtk_adjustment_set_upper (IntPtr i, double upper); + public double Upper { get { return gtksharp_gtk_adjustment_get_upper (this.Handle); } + set { + gtksharp_gtk_adjustment_set_upper (Handle, value); + } } [DllImport ("gtksharpglue")] diff --git a/gtk/CheckMenuItem.custom b/gtk/CheckMenuItem.custom index a79b53492..b11e9427a 100644 --- a/gtk/CheckMenuItem.custom +++ b/gtk/CheckMenuItem.custom @@ -18,6 +18,7 @@ al.SetAlignment (0.0f, 0.5f); Add (al); al.AccelWidget = this; + return; } Raw = gtk_check_menu_item_new_with_mnemonic (label); diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata index b02026d83..3294f3317 100644 --- a/gtk/Gtk.metadata +++ b/gtk/Gtk.metadata @@ -60,6 +60,8 @@ EmitRowInserted EmitRowsReordered ChangeSortColumn + label + 1 Change ChangeValue 1 diff --git a/gtk/ImageMenuItem.custom b/gtk/ImageMenuItem.custom index 333c11ff9..e5fe36a03 100644 --- a/gtk/ImageMenuItem.custom +++ b/gtk/ImageMenuItem.custom @@ -18,6 +18,7 @@ al.SetAlignment (0.0f, 0.5f); Add (al); al.AccelWidget = this; + return; } Raw = gtk_image_menu_item_new_with_mnemonic (label); diff --git a/gtk/MenuItem.custom b/gtk/MenuItem.custom index 4a9febfe3..5a3e93f62 100644 --- a/gtk/MenuItem.custom +++ b/gtk/MenuItem.custom @@ -18,6 +18,7 @@ al.SetAlignment (0.0f, 0.5f); Add (al); al.AccelWidget = this; + return; } Raw = gtk_menu_item_new_with_mnemonic (label); diff --git a/gtk/RadioMenuItem.custom b/gtk/RadioMenuItem.custom index 80bf2aa95..3b7efbce2 100644 --- a/gtk/RadioMenuItem.custom +++ b/gtk/RadioMenuItem.custom @@ -14,6 +14,7 @@ al.SetAlignment (0.0f, 0.5f); Add (al); al.AccelWidget = this; + return; } Raw = gtk_radio_menu_item_new_with_mnemonic (IntPtr.Zero, label); diff --git a/gtk/glue/adjustment.c b/gtk/glue/adjustment.c index e2cdd55fd..f5f7aab24 100644 --- a/gtk/glue/adjustment.c +++ b/gtk/glue/adjustment.c @@ -15,8 +15,10 @@ void gtksharp_gtk_adjustment_set_bounds (GtkAdjustment *adj, gdouble page_size); gdouble gtksharp_gtk_adjustment_get_lower (GtkAdjustment *adj); +void gtksharp_gtk_adjustment_set_lower (GtkAdjustment *adj, gdouble lower); gdouble gtksharp_gtk_adjustment_get_upper (GtkAdjustment *adj); +void gtksharp_gtk_adjustment_set_upper (GtkAdjustment *adj, gdouble upper); gdouble gtksharp_gtk_adjustment_get_step_increment (GtkAdjustment *adj); @@ -54,12 +56,28 @@ gtksharp_gtk_adjustment_get_lower (GtkAdjustment *adj) return adj->lower; } +void +gtksharp_gtk_adjustment_set_lower (GtkAdjustment *adj, gdouble lower) +{ + adj->lower = lower; + + gtk_adjustment_changed (adj); +} + gdouble gtksharp_gtk_adjustment_get_upper (GtkAdjustment *adj) { return adj->upper; } +void +gtksharp_gtk_adjustment_set_upper (GtkAdjustment *adj, gdouble upper) +{ + adj->upper = upper; + + gtk_adjustment_changed (adj); +} + gdouble gtksharp_gtk_adjustment_get_step_increment (GtkAdjustment *adj) {