diff --git a/ChangeLog b/ChangeLog index 71dfedd91..023a8d9e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2008-06-20 Michael Natterer + + * gtk/gtkaccellabel.h + * gtk/gtkactiongroup.h + * gtk/gtkalignment.h + * gtk/gtkarrow.h + * gtk/gtkaspectframe.h + * gtk/gtkbin.h + * gtk/gtkhandlebox.h + * gtk/gtkprogressbar.h + * gtk/gtkrange.h + * gtk/gtkscale.h + * gtk/gtkscalebutton.h + * gtk/gtkselection.h: fix some formatting and spacing uglyness + that got merged from the GSEAL branch. + 2008-06-20 Johan Dahlin * gtk/gtk.symbols: diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h index a16c9b061..8703f5287 100644 --- a/gtk/gtkaccellabel.h +++ b/gtk/gtkaccellabel.h @@ -55,13 +55,13 @@ struct _GtkAccelLabel { GtkLabel label; - guint GSEAL (gtk_reserved); - guint GSEAL (accel_padding); /* should be style property? */ - GtkWidget *GSEAL (accel_widget); /* done*/ - GClosure *GSEAL (accel_closure); /* has set function */ - GtkAccelGroup *GSEAL (accel_group); /* set by set_accel_closure() */ - gchar *GSEAL (accel_string); /* has set function */ - guint16 GSEAL (accel_string_width); /* seems to be private */ + guint GSEAL (gtk_reserved); + guint GSEAL (accel_padding); /* should be style property? */ + GtkWidget *GSEAL (accel_widget); /* done*/ + GClosure *GSEAL (accel_closure); /* has set function */ + GtkAccelGroup *GSEAL (accel_group); /* set by set_accel_closure() */ + gchar *GSEAL (accel_string); /* has set function */ + guint16 GSEAL (accel_string_width); /* seems to be private */ }; struct _GtkAccelLabelClass diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h index 438c8fc34..1d8b388b1 100644 --- a/gtk/gtkactiongroup.h +++ b/gtk/gtkactiongroup.h @@ -60,7 +60,7 @@ struct _GtkActionGroup /*< private >*/ - GtkActionGroupPrivate *GSEAL(private_data); + GtkActionGroupPrivate *GSEAL (private_data); }; struct _GtkActionGroupClass diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h index 0c34b4ca9..f37359334 100644 --- a/gtk/gtkalignment.h +++ b/gtk/gtkalignment.h @@ -54,10 +54,10 @@ struct _GtkAlignment { GtkBin bin; - gfloat GSEAL(xalign); - gfloat GSEAL(yalign); - gfloat GSEAL(xscale); - gfloat GSEAL(yscale); + gfloat GSEAL (xalign); + gfloat GSEAL (yalign); + gfloat GSEAL (xscale); + gfloat GSEAL (yscale); }; struct _GtkAlignmentClass diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h index 08fca7175..fc5b8381c 100644 --- a/gtk/gtkarrow.h +++ b/gtk/gtkarrow.h @@ -54,8 +54,8 @@ struct _GtkArrow { GtkMisc misc; - gint16 GSEAL(arrow_type); - gint16 GSEAL(shadow_type); + gint16 GSEAL (arrow_type); + gint16 GSEAL (shadow_type); }; struct _GtkArrowClass diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h index 3f8475273..668c38400 100644 --- a/gtk/gtkaspectframe.h +++ b/gtk/gtkaspectframe.h @@ -52,10 +52,10 @@ struct _GtkAspectFrame { GtkFrame frame; - gfloat GSEAL(xalign); - gfloat GSEAL(yalign); - gfloat GSEAL(ratio); - gboolean GSEAL(obey_child); + gfloat GSEAL (xalign); + gfloat GSEAL (yalign); + gfloat GSEAL (ratio); + gboolean GSEAL (obey_child); GtkAllocation GSEAL (center_allocation); }; diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h index 430efd69c..6dd8c53e2 100644 --- a/gtk/gtkbin.h +++ b/gtk/gtkbin.h @@ -53,7 +53,7 @@ struct _GtkBin { GtkContainer container; - GtkWidget * GSEAL(child); + GtkWidget *GSEAL (child); }; struct _GtkBinClass diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h index b73bdd396..9ee0fccfd 100644 --- a/gtk/gtkhandlebox.h +++ b/gtk/gtkhandlebox.h @@ -61,21 +61,21 @@ struct _GtkHandleBox GdkWindow *GSEAL (bin_window); /* parent window for children */ GdkWindow *GSEAL (float_window); GtkShadowType GSEAL (shadow_type); - guint GSEAL (handle_position) : 2; - guint GSEAL (float_window_mapped) : 1; - guint GSEAL (child_detached) : 1; - guint GSEAL (in_drag) : 1; - guint GSEAL (shrink_on_detach) : 1; + guint GSEAL (handle_position) : 2; + guint GSEAL (float_window_mapped) : 1; + guint GSEAL (child_detached) : 1; + guint GSEAL (in_drag) : 1; + guint GSEAL (shrink_on_detach) : 1; signed int GSEAL (snap_edge : 3); /* -1 == unset */ /* Variables used during a drag */ - gint GSEAL (deskoff_x); /* Offset between root relative coordinates */ - gint GSEAL (deskoff_y); /* and deskrelative coordinates */ + gint GSEAL (deskoff_x); /* Offset between root relative coords */ + gint GSEAL (deskoff_y); /* and deskrelative coords */ - GtkAllocation GSEAL (attach_allocation); - GtkAllocation GSEAL (float_allocation); + GtkAllocation GSEAL (attach_allocation); + GtkAllocation GSEAL (float_allocation); }; struct _GtkHandleBoxClass diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h index f4a5aeda4..a62b584ae 100644 --- a/gtk/gtkprogressbar.h +++ b/gtk/gtkprogressbar.h @@ -67,18 +67,18 @@ struct _GtkProgressBar { GtkProgress progress; - GtkProgressBarStyle GSEAL(bar_style); - GtkProgressBarOrientation GSEAL(orientation); + GtkProgressBarStyle GSEAL (bar_style); + GtkProgressBarOrientation GSEAL (orientation); - guint GSEAL(blocks); - gint GSEAL(in_block); + guint GSEAL (blocks); + gint GSEAL (in_block); - gint GSEAL(activity_pos); - guint GSEAL(activity_step); - guint GSEAL(activity_blocks); + gint GSEAL (activity_pos); + guint GSEAL (activity_step); + guint GSEAL (activity_blocks); + + gdouble GSEAL (pulse_fraction); - gdouble GSEAL(pulse_fraction); - guint GSEAL (activity_dir) : 1; guint GSEAL (ellipsize) : 3; guint GSEAL (dirty) : 1; diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h index b3c497d4c..5efa7547a 100644 --- a/gtk/gtkrange.h +++ b/gtk/gtkrange.h @@ -86,7 +86,8 @@ struct _GtkRange /* Area of entire stepper + trough assembly in widget->window coords */ GdkRectangle GSEAL (range_rect); /* Slider range along the long dimension, in widget->window coords */ - gint GSEAL (slider_start), GSEAL (slider_end); + gint GSEAL (slider_start); + gint GSEAL (slider_end); /* Round off value to this many digits, -1 for no rounding */ gint GSEAL (round_digits); diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h index b83b699e1..3addba6ea 100644 --- a/gtk/gtkscale.h +++ b/gtk/gtkscale.h @@ -53,7 +53,7 @@ struct _GtkScale { GtkRange range; - gint GSEAL(digits); + gint GSEAL (digits); guint GSEAL (draw_value) : 1; guint GSEAL (value_pos) : 2; }; diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h index f08dfb98f..7384db05c 100644 --- a/gtk/gtkscalebutton.h +++ b/gtk/gtkscalebutton.h @@ -59,8 +59,8 @@ struct _GtkScaleButton { GtkButton parent; - GtkWidget *GSEAL(plus_button); - GtkWidget *GSEAL(minus_button); + GtkWidget *GSEAL (plus_button); + GtkWidget *GSEAL (minus_button); /*< private >*/ GtkScaleButtonPrivate *GSEAL (priv); diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h index def530877..45219fdd4 100644 --- a/gtk/gtkselection.h +++ b/gtk/gtkselection.h @@ -58,12 +58,12 @@ typedef struct _GtkTargetEntry GtkTargetEntry; struct _GtkSelectionData { - GdkAtom GSEAL (selection); - GdkAtom GSEAL (target); - GdkAtom GSEAL (type); - gint GSEAL (format); + GdkAtom GSEAL (selection); + GdkAtom GSEAL (target); + GdkAtom GSEAL (type); + gint GSEAL (format); guchar *GSEAL (data); - gint GSEAL (length); + gint GSEAL (length); GdkDisplay *GSEAL (display); };