gEDA-cvs: gaf.git: branch: master updated (1.7.0-20110116-25-gddb932b)

[git@xxxxxxxxxx]

The branch, master has been updated
  discards  fe8f6957d0d82603fdd46f03301c016123ba09cf (commit)
       via  ddb932b52888c181d1eea9934776fb303e463c56 (commit)
      from  fe8f6957d0d82603fdd46f03301c016123ba09cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 gschem/include/gschem_struct.h |    4 ++--
 gschem/src/x_window.c          |   22 +++++++++-------------
 2 files changed, 11 insertions(+), 15 deletions(-)


=================
 Commit Messages
=================

commit ddb932b52888c181d1eea9934776fb303e463c56
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    gschem: Use GtkAdjustment type, not deprecated GtkObject

:100644 100644 c4754cf... c945f60... M	gschem/include/gschem_struct.h
:100644 100644 c780bd7... 2ee9f82... M	gschem/src/x_window.c

=========
 Changes
=========

commit ddb932b52888c181d1eea9934776fb303e463c56
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    gschem: Use GtkAdjustment type, not deprecated GtkObject

diff --git a/gschem/include/gschem_struct.h b/gschem/include/gschem_struct.h
index c4754cf..c945f60 100644
--- a/gschem/include/gschem_struct.h
+++ b/gschem/include/gschem_struct.h
@@ -19,8 +19,8 @@ struct st_gschem_toplevel {
 
   GtkWidget *h_scrollbar;
   GtkWidget *v_scrollbar;
-  GtkObject *h_adjustment;
-  GtkObject *v_adjustment;
+  GtkAdjustment *h_adjustment;
+  GtkAdjustment *v_adjustment;
 
   GtkWidget *macro_box;
   GtkWidget *macro_entry;
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index c780bd7..2ee9f82 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -417,13 +417,11 @@ void x_window_create_main(GSCHEM_TOPLEVEL *w_current)
 
   if (w_current->scrollbars_flag == TRUE) {
     /* setup scroll bars */
-    w_current->v_adjustment =
-      gtk_adjustment_new (toplevel->init_bottom,
-                          0.0, toplevel->init_bottom,
-                          100.0, 100.0, 10.0);
+    w_current->v_adjustment = GTK_ADJUSTMENT (
+      gtk_adjustment_new (toplevel->init_bottom, 0.0, toplevel->init_bottom,
+                          100.0, 100.0, 10.0));
 
-    w_current->v_scrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (
-                                                                 w_current->v_adjustment));
+    w_current->v_scrollbar = gtk_vscrollbar_new (w_current->v_adjustment);
 
     gtk_range_set_update_policy (GTK_RANGE (w_current->v_scrollbar),
                                  GTK_UPDATE_CONTINUOUS);
@@ -431,17 +429,15 @@ void x_window_create_main(GSCHEM_TOPLEVEL *w_current)
     gtk_box_pack_start (GTK_BOX (drawbox), w_current->v_scrollbar,
                         FALSE, FALSE, 0);
 
-    g_signal_connect (G_OBJECT (w_current->v_adjustment),
+    g_signal_connect (w_current->v_adjustment,
                       "value_changed",
                       G_CALLBACK (x_event_vschanged),
                       w_current);
 
-    w_current->h_adjustment = gtk_adjustment_new (0.0, 0.0,
-                                                  toplevel->init_right,
-                                                  100.0, 100.0, 10.0);
+    w_current->h_adjustment = GTK_ADJUSTMENT (
+      gtk_adjustment_new (0.0, 0.0, toplevel->init_right, 100.0, 100.0, 10.0));
 
-    w_current->h_scrollbar = gtk_hscrollbar_new (GTK_ADJUSTMENT (
-                                                                 w_current->h_adjustment));
+    w_current->h_scrollbar = gtk_hscrollbar_new (w_current->h_adjustment);
 
     gtk_range_set_update_policy (GTK_RANGE (w_current->h_scrollbar),
                                  GTK_UPDATE_CONTINUOUS);
@@ -449,7 +445,7 @@ void x_window_create_main(GSCHEM_TOPLEVEL *w_current)
     gtk_box_pack_start (GTK_BOX (main_box), w_current->h_scrollbar,
                         FALSE, FALSE, 0);
 
-    g_signal_connect (G_OBJECT (w_current->h_adjustment),
+    g_signal_connect (w_current->h_adjustment,
                       "value_changed",
                       G_CALLBACK (x_event_hschanged),
                       w_current);




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs