[Gpredict-svn] SF.net SVN: gpredict:[880] trunk
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
[Gpredict-svn] SF.net SVN: gpredict:[880] trunk
|
From: <aa...@us...> - 2011-07-31 12:26:14
|
Revision: 880
http://gpredict.svn.sourceforge.net/gpredict/?rev=880&view=rev
Author: aa1vs
Date: 2011-07-31 12:26:07 +0000 (Sun, 31 Jul 2011)
Log Message:
-----------
Remove deprecated calls and functions to allow make CFLAGS+="-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" to work per <http://developer.gnome.org/gtk3/3.0/gtk-migrating-2-to-3.html>.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-azel-plot.c
trunk/src/gtk-azel-plot.h
trunk/src/gtk-event-list.h
trunk/src/gtk-freq-knob.c
trunk/src/gtk-freq-knob.h
trunk/src/gtk-polar-plot.c
trunk/src/gtk-polar-plot.h
trunk/src/gtk-polar-view.c
trunk/src/gtk-polar-view.h
trunk/src/gtk-rig-ctrl.h
trunk/src/gtk-rot-ctrl.h
trunk/src/gtk-rot-knob.c
trunk/src/gtk-rot-knob.h
trunk/src/gtk-sat-list-col-sel.h
trunk/src/gtk-sat-list.h
trunk/src/gtk-sat-map.c
trunk/src/gtk-sat-map.h
trunk/src/gtk-sat-module.h
trunk/src/gtk-sat-selector.h
trunk/src/gtk-sat-tree.h
trunk/src/gtk-single-sat.h
trunk/src/gtk-sky-glance.c
trunk/src/gtk-sky-glance.h
trunk/src/mod-mgr.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/ChangeLog 2011-07-31 12:26:07 UTC (rev 880)
@@ -1,3 +1,32 @@
+2011-07-31 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/gtk-rot-knob.c
+ * src/gtk-rot-knob.h
+ * src/gtk-sky-glance.c
+ * src/gtk-sky-glance.h
+ * src/gtk-rig-ctrl.h
+ * src/gtk-sat-list.h
+ * src/gtk-sat-module.h
+ * src/gtk-sat-list-col-sel.h
+ * src/gtk-sat-selector.h
+ * src/gtk-single-sat.h
+ * src/gtk-polar-plot.c
+ * src/gtk-polar-plot.h
+ * src/gtk-event-list.h
+ * src/gtk-sat-map.c
+ * src/gtk-sat-map.h
+ * src/gtk-freq-knob.c
+ * src/gtk-freq-knob.h
+ * src/gtk-azel-plot.c
+ * src/gtk-rot-ctrl.h
+ * src/gtk-azel-plot.h
+ * src/mod-mgr.c
+ * src/gtk-polar-view.c
+ * src/gtk-sat-tree.h
+ * src/gtk-polar-view.h
+ Remove deprecated calls and functions to allow make CFLAGS+="-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" to work per <http://developer.gnome.org/gtk3/3.0/gtk-migrating-2-to-3.html>.
+
+
2011-07-30 Charles Suprin <hamaa1vs at gmail.com>
* src/gtk-azel-plot.h
Modified: trunk/src/gtk-azel-plot.c
===================================================================
--- trunk/src/gtk-azel-plot.c 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-azel-plot.c 2011-07-31 12:26:07 UTC (rev 880)
@@ -82,10 +82,10 @@
static GtkVBoxClass *parent_class = NULL;
-GtkType
+GType
gtk_azel_plot_get_type ()
{
- static GtkType gtk_azel_plot_type = 0;
+ static GType gtk_azel_plot_type = 0;
if (!gtk_azel_plot_type) {
static const GTypeInfo gtk_azel_plot_info = {
@@ -206,11 +206,11 @@
/* connect size-request signal */
g_signal_connect (GTK_AZEL_PLOT (polv)->canvas, "size-allocate",
- G_CALLBACK (size_allocate_cb), polv);
+ G_CALLBACK (size_allocate_cb), polv);
g_signal_connect (GTK_AZEL_PLOT (polv)->canvas, "item_created",
- (GtkSignalFunc) on_item_created, polv);
+ G_CALLBACK (on_item_created), polv);
g_signal_connect_after (GTK_AZEL_PLOT (polv)->canvas, "realize",
- (GtkSignalFunc) on_canvas_realized, polv);
+ G_CALLBACK (on_canvas_realized), polv);
gtk_widget_show (GTK_AZEL_PLOT (polv)->canvas);
@@ -745,7 +745,7 @@
if (!goo_canvas_item_model_get_parent (model)) {
/* root item / canvas */
g_signal_connect (item, "motion_notify_event",
- (GtkSignalFunc) on_motion_notify, data);
+ G_CALLBACK (on_motion_notify), data);
}
}
Modified: trunk/src/gtk-azel-plot.h
===================================================================
--- trunk/src/gtk-azel-plot.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-azel-plot.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -46,11 +46,11 @@
#define AZEL_PLOT_NUM_TICKS 5
-#define GTK_AZEL_PLOT(obj) GTK_CHECK_CAST (obj, gtk_azel_plot_get_type (), GtkAzelPlot)
-#define GTK_AZEL_PLOT_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_azel_plot_get_type (), GtkAzelPlotClass)
-#define GTK_IS_AZEL_PLOT(obj) GTK_CHECK_TYPE (obj, gtk_azel_plot_get_type ())
+#define GTK_AZEL_PLOT(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gtk_azel_plot_get_type (), GtkAzelPlot)
+#define GTK_AZEL_PLOT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gtk_azel_plot_get_type (), GtkAzelPlotClass)
+#define GTK_IS_AZEL_PLOT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_azel_plot_get_type ())
#define GTK_TYPE_AZEL_PLOT (gtk_azel_plot_get_type ())
-#define IS_GTK_AZEL_PLOT(obj) GTK_CHECK_TYPE (obj, gtk_azel_plot_get_type ())
+#define IS_GTK_AZEL_PLOT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_azel_plot_get_type ())
typedef struct _GtkAzelPlot GtkAzelPlot;
typedef struct _GtkAzelPlotClass GtkAzelPlotClass;
@@ -102,7 +102,7 @@
-GtkType gtk_azel_plot_get_type (void);
+GType gtk_azel_plot_get_type (void);
GtkWidget* gtk_azel_plot_new (qth_t *qth, pass_t *pass);
Modified: trunk/src/gtk-event-list.h
===================================================================
--- trunk/src/gtk-event-list.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-event-list.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -41,15 +41,15 @@
#define GTK_TYPE_EVENT_LIST (gtk_event_list_get_type ())
-#define GTK_EVENT_LIST(obj) GTK_CHECK_CAST (obj,\
+#define GTK_EVENT_LIST(obj) G_TYPE_CHECK_INSTANCE_CAST (obj,\
gtk_event_list_get_type (),\
GtkEventList)
-#define GTK_EVENT_LIST_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+#define GTK_EVENT_LIST_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass,\
gtk_event_list_get_type (),\
GtkEventListClass)
-#define IS_GTK_EVENT_LIST(obj) GTK_CHECK_TYPE (obj, gtk_event_list_get_type ())
+#define IS_GTK_EVENT_LIST(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_event_list_get_type ())
typedef struct _gtk_event_list GtkEventList;
@@ -103,7 +103,7 @@
} event_list_flag_t;
-GtkType gtk_event_list_get_type (void);
+GType gtk_event_list_get_type (void);
GtkWidget* gtk_event_list_new (GKeyFile *cfgdata,
GHashTable *sats,
qth_t *qth,
Modified: trunk/src/gtk-freq-knob.c
===================================================================
--- trunk/src/gtk-freq-knob.c 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-freq-knob.c 2011-07-31 12:26:07 UTC (rev 880)
@@ -199,9 +199,9 @@
idx[i], idx[i]+1, 1, 2, GTK_SHRINK, GTK_FILL | GTK_EXPAND, 0, 0);
g_signal_connect (GTK_FREQ_KNOB(widget)->evtbox[i], "button_press_event",
- (GtkSignalFunc) on_button_press, widget);
+ (GCallback) on_button_press, widget);
g_signal_connect (GTK_FREQ_KNOB(widget)->evtbox[i], "scroll_event",
- (GtkSignalFunc) on_button_scroll, widget);
+ (GCallback) on_button_scroll, widget);
/* UP buttons */
Modified: trunk/src/gtk-freq-knob.h
===================================================================
--- trunk/src/gtk-freq-knob.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-freq-knob.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -41,15 +41,15 @@
#define GTK_TYPE_FREQ_KNOB (gtk_freq_knob_get_type ())
-#define GTK_FREQ_KNOB(obj) GTK_CHECK_CAST (obj,\
+#define GTK_FREQ_KNOB(obj) G_TYPE_CHECK_INSTANCE_CAST (obj,\
gtk_freq_knob_get_type (),\
GtkFreqKnob)
-#define GTK_FREQ_KNOB_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+#define GTK_FREQ_KNOB_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass,\
gtk_freq_knob_get_type (),\
GtkFreqKnobClass)
-#define IS_GTK_FREQ_KNOB(obj) GTK_CHECK_TYPE (obj, gtk_freq_knob_get_type ())
+#define IS_GTK_FREQ_KNOB(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_freq_knob_get_type ())
typedef struct _gtk_freq_knob GtkFreqKnob;
@@ -77,7 +77,7 @@
-GtkType gtk_freq_knob_get_type (void);
+GType gtk_freq_knob_get_type (void);
GtkWidget* gtk_freq_knob_new (gdouble val, gboolean buttons);
void gtk_freq_knob_set_value (GtkFreqKnob *knob, gdouble val);
gdouble gtk_freq_knob_get_value (GtkFreqKnob *knob);
Modified: trunk/src/gtk-polar-plot.c
===================================================================
--- trunk/src/gtk-polar-plot.c 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-polar-plot.c 2011-07-31 12:26:07 UTC (rev 880)
@@ -93,7 +93,7 @@
static GtkVBoxClass *parent_class = NULL;
-GtkType
+GType
gtk_polar_plot_get_type ()
{
static GType gtk_polar_plot_type = 0;
@@ -211,9 +211,9 @@
g_signal_connect (GTK_POLAR_PLOT (polv)->canvas, "size-allocate",
G_CALLBACK (size_allocate_cb), polv);
g_signal_connect (GTK_POLAR_PLOT (polv)->canvas, "item_created",
- (GtkSignalFunc) on_item_created, polv);
+ (GCallback) on_item_created, polv);
g_signal_connect_after (GTK_POLAR_PLOT (polv)->canvas, "realize",
- (GtkSignalFunc) on_canvas_realized, polv);
+ (GCallback) on_canvas_realized, polv);
gtk_widget_show (GTK_POLAR_PLOT (polv)->canvas);
@@ -1216,7 +1216,7 @@
if (!goo_canvas_item_model_get_parent (model)) {
/* root item / canvas */
g_signal_connect (item, "motion_notify_event",
- (GtkSignalFunc) on_motion_notify, data);
+ (GCallback) on_motion_notify, data);
}
}
Modified: trunk/src/gtk-polar-plot.h
===================================================================
--- trunk/src/gtk-polar-plot.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-polar-plot.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -46,11 +46,11 @@
#define TRACK_TICK_NUM 5
-#define GTK_POLAR_PLOT(obj) GTK_CHECK_CAST (obj, gtk_polar_plot_get_type (), GtkPolarPlot)
-#define GTK_POLAR_PLOT_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_polar_plot_get_type (), GtkPolarPlotClass)
-#define GTK_IS_POLAR_PLOT(obj) GTK_CHECK_TYPE (obj, gtk_polar_plot_get_type ())
+#define GTK_POLAR_PLOT(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gtk_polar_plot_get_type (), GtkPolarPlot)
+#define GTK_POLAR_PLOT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gtk_polar_plot_get_type (), GtkPolarPlotClass)
+#define GTK_IS_POLAR_PLOT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_polar_plot_get_type ())
#define GTK_TYPE_POLAR_PLOT (gtk_polar_plot_get_type ())
-#define IS_GTK_POLAR_PLOT(obj) GTK_CHECK_TYPE (obj, gtk_polar_plot_get_type ())
+#define IS_GTK_POLAR_PLOT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_polar_plot_get_type ())
typedef struct _GtkPolarPlot GtkPolarPlot;
typedef struct _GtkPolarPlotClass GtkPolarPlotClass;
@@ -118,7 +118,7 @@
- GtkType gtk_polar_plot_get_type (void);
+ GType gtk_polar_plot_get_type (void);
GtkWidget* gtk_polar_plot_new (qth_t *qth, pass_t *pass);
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-polar-view.c 2011-07-31 12:26:07 UTC (rev 880)
@@ -97,7 +97,7 @@
static GtkVBoxClass *parent_class = NULL;
-GtkType
+GType
gtk_polar_view_get_type ()
{
static GType gtk_polar_view_type = 0;
@@ -255,9 +255,9 @@
g_signal_connect (GTK_POLAR_VIEW (polv)->canvas, "size-allocate",
G_CALLBACK (size_allocate_cb), polv);
g_signal_connect (GTK_POLAR_VIEW (polv)->canvas, "item_created",
- (GtkSignalFunc) on_item_created, polv);
+ (GCallback) on_item_created, polv);
g_signal_connect_after (GTK_POLAR_VIEW (polv)->canvas, "realize",
- (GtkSignalFunc) on_canvas_realized, polv);
+ (GCallback) on_canvas_realized, polv);
gtk_widget_show (GTK_POLAR_VIEW (polv)->canvas);
@@ -1395,14 +1395,14 @@
if (!goo_canvas_item_model_get_parent (model)) {
/* root item / canvas */
g_signal_connect (item, "motion_notify_event",
- (GtkSignalFunc) on_motion_notify, data);
+ (GCallback) on_motion_notify, data);
}
else if (!g_object_get_data (G_OBJECT (item), "skip-signal-connection")) {
g_signal_connect (item, "button_press_event",
- (GtkSignalFunc) on_button_press, data);
+ (GCallback) on_button_press, data);
g_signal_connect (item, "button_release_event",
- (GtkSignalFunc) on_button_release, data);
+ (GCallback) on_button_release, data);
}
}
Modified: trunk/src/gtk-polar-view.h
===================================================================
--- trunk/src/gtk-polar-view.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-polar-view.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -46,11 +46,11 @@
#define TRACK_TICK_NUM 4
-#define GTK_POLAR_VIEW(obj) GTK_CHECK_CAST (obj, gtk_polar_view_get_type (), GtkPolarView)
-#define GTK_POLAR_VIEW_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_polar_view_get_type (), GtkPolarViewClass)
-#define GTK_IS_POLAR_VIEW(obj) GTK_CHECK_TYPE (obj, gtk_polar_view_get_type ())
+#define GTK_POLAR_VIEW(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gtk_polar_view_get_type (), GtkPolarView)
+#define GTK_POLAR_VIEW_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gtk_polar_view_get_type (), GtkPolarViewClass)
+#define GTK_IS_POLAR_VIEW(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_polar_view_get_type ())
#define GTK_TYPE_POLAR_VIEW (gtk_polar_view_get_type ())
-#define IS_GTK_POLAR_VIEW(obj) GTK_CHECK_TYPE (obj, gtk_polar_view_get_type ())
+#define IS_GTK_POLAR_VIEW(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_polar_view_get_type ())
typedef struct _GtkPolarView GtkPolarView;
typedef struct _GtkPolarViewClass GtkPolarViewClass;
@@ -140,7 +140,7 @@
-GtkType gtk_polar_view_get_type (void);
+GType gtk_polar_view_get_type (void);
GtkWidget* gtk_polar_view_new (GKeyFile *cfgdata,
GHashTable *sats,
Modified: trunk/src/gtk-rig-ctrl.h
===================================================================
--- trunk/src/gtk-rig-ctrl.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-rig-ctrl.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -44,15 +44,15 @@
#define GTK_TYPE_RIG_CTRL (gtk_rig_ctrl_get_type ())
-#define GTK_RIG_CTRL(obj) GTK_CHECK_CAST (obj,\
+#define GTK_RIG_CTRL(obj) G_TYPE_CHECK_INSTANCE_CAST (obj,\
gtk_rig_ctrl_get_type (),\
GtkRigCtrl)
-#define GTK_RIG_CTRL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+#define GTK_RIG_CTRL_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass,\
gtk_rig_ctrl_get_type (),\
GtkRigCtrlClass)
-#define IS_GTK_RIG_CTRL(obj) GTK_CHECK_TYPE (obj, gtk_rig_ctrl_get_type ())
+#define IS_GTK_RIG_CTRL(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_rig_ctrl_get_type ())
typedef struct _gtk_rig_ctrl GtkRigCtrl;
@@ -123,7 +123,7 @@
-GtkType gtk_rig_ctrl_get_type (void);
+GType gtk_rig_ctrl_get_type (void);
GtkWidget* gtk_rig_ctrl_new (GtkSatModule *module);
void gtk_rig_ctrl_update (GtkRigCtrl *ctrl, gdouble t);
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-rot-ctrl.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -43,15 +43,15 @@
#define GTK_TYPE_ROT_CTRL (gtk_rot_ctrl_get_type ())
-#define GTK_ROT_CTRL(obj) GTK_CHECK_CAST (obj,\
+#define GTK_ROT_CTRL(obj) G_TYPE_CHECK_INSTANCE_CAST (obj,\
gtk_rot_ctrl_get_type (),\
GtkRotCtrl)
-#define GTK_ROT_CTRL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+#define GTK_ROT_CTRL_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass,\
gtk_rot_ctrl_get_type (),\
GtkRotCtrlClass)
-#define IS_GTK_ROT_CTRL(obj) GTK_CHECK_TYPE (obj, gtk_rot_ctrl_get_type ())
+#define IS_GTK_ROT_CTRL(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_rot_ctrl_get_type ())
typedef struct _gtk_rot_ctrl GtkRotCtrl;
@@ -108,7 +108,7 @@
-GtkType gtk_rot_ctrl_get_type (void);
+GType gtk_rot_ctrl_get_type (void);
GtkWidget* gtk_rot_ctrl_new (GtkSatModule *module);
void gtk_rot_ctrl_update (GtkRotCtrl *ctrl, gdouble t);
Modified: trunk/src/gtk-rot-knob.c
===================================================================
--- trunk/src/gtk-rot-knob.c 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-rot-knob.c 2011-07-31 12:26:07 UTC (rev 880)
@@ -299,9 +299,9 @@
i, i+1, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
g_signal_connect (GTK_ROT_KNOB(widget)->evtbox[i], "button_press_event",
- (GtkSignalFunc) on_button_press, widget);
+ (GCallback) on_button_press, widget);
g_signal_connect (GTK_ROT_KNOB(widget)->evtbox[i], "scroll_event",
- (GtkSignalFunc) on_button_scroll, widget);
+ (GCallback) on_button_scroll, widget);
}
Modified: trunk/src/gtk-rot-knob.h
===================================================================
--- trunk/src/gtk-rot-knob.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-rot-knob.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -41,15 +41,15 @@
#define GTK_TYPE_ROT_KNOB (gtk_rot_knob_get_type ())
-#define GTK_ROT_KNOB(obj) GTK_CHECK_CAST (obj,\
+#define GTK_ROT_KNOB(obj) G_TYPE_CHECK_INSTANCE_CAST (obj,\
gtk_rot_knob_get_type (),\
GtkRotKnob)
-#define GTK_ROT_KNOB_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+#define GTK_ROT_KNOB_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass,\
gtk_rot_knob_get_type (),\
GtkRotKnobClass)
-#define IS_GTK_ROT_KNOB(obj) GTK_CHECK_TYPE (obj, gtk_rot_knob_get_type ())
+#define IS_GTK_ROT_KNOB(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_rot_knob_get_type ())
typedef struct _gtk_rot_knob GtkRotKnob;
@@ -77,7 +77,7 @@
-GtkType gtk_rot_knob_get_type (void);
+GType gtk_rot_knob_get_type (void);
GtkWidget* gtk_rot_knob_new (gdouble min, gdouble max, gdouble val);
void gtk_rot_knob_set_value (GtkRotKnob *knob, gdouble val);
gdouble gtk_rot_knob_get_value (GtkRotKnob *knob);
Modified: trunk/src/gtk-sat-list-col-sel.h
===================================================================
--- trunk/src/gtk-sat-list-col-sel.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-sat-list-col-sel.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -38,15 +38,15 @@
#define GTK_TYPE_SAT_LIST_COL_SEL (gtk_sat_list_col_sel_get_type ())
-#define GTK_SAT_LIST_COL_SEL(obj) GTK_CHECK_CAST (obj,\
+#define GTK_SAT_LIST_COL_SEL(obj) G_TYPE_CHECK_INSTANCE_CAST (obj,\
gtk_sat_list_col_sel_get_type (),\
GtkSatListColSel)
-#define GTK_SAT_LIST_COL_SEL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+#define GTK_SAT_LIST_COL_SEL_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass,\
gtk_sat_list_col_sel_get_type (),\
GtkSatListColSelClass)
-#define IS_GTK_SAT_LIST_COL_SEL(obj) GTK_CHECK_TYPE (obj, gtk_sat_list_col_sel_get_type ())
+#define IS_GTK_SAT_LIST_COL_SEL(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_sat_list_col_sel_get_type ())
@@ -70,7 +70,7 @@
};
-GtkType gtk_sat_list_col_sel_get_type (void);
+GType gtk_sat_list_col_sel_get_type (void);
GtkWidget *gtk_sat_list_col_sel_new (guint32 flags);
guint32 gtk_sat_list_col_sel_get_flags (GtkSatListColSel *sel);
void gtk_sat_list_col_sel_set_flags (GtkSatListColSel *sel, guint32 flags);
Modified: trunk/src/gtk-sat-list.h
===================================================================
--- trunk/src/gtk-sat-list.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-sat-list.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -41,15 +41,15 @@
#define GTK_TYPE_SAT_LIST (gtk_sat_list_get_type ())
-#define GTK_SAT_LIST(obj) GTK_CHECK_CAST (obj,\
+#define GTK_SAT_LIST(obj) G_TYPE_CHECK_INSTANCE_CAST (obj,\
gtk_sat_list_get_type (),\
GtkSatList)
-#define GTK_SAT_LIST_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+#define GTK_SAT_LIST_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass,\
gtk_sat_list_get_type (),\
GtkSatListClass)
-#define IS_GTK_SAT_LIST(obj) GTK_CHECK_TYPE (obj, gtk_sat_list_get_type ())
+#define IS_GTK_SAT_LIST(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_sat_list_get_type ())
typedef struct _gtk_sat_list GtkSatList;
@@ -143,7 +143,7 @@
} sat_list_flag_t;
-GtkType gtk_sat_list_get_type (void);
+GType gtk_sat_list_get_type (void);
GtkWidget* gtk_sat_list_new (GKeyFile *cfgdata,
GHashTable *sats,
qth_t *qth,
Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-sat-map.c 2011-07-31 12:26:07 UTC (rev 880)
@@ -114,7 +114,7 @@
/** \brief Register the satellite map widget. */
-GtkType
+GType
gtk_sat_map_get_type ()
{
static GType gtk_sat_map_type = 0;
@@ -281,9 +281,9 @@
g_signal_connect (GTK_SAT_MAP (satmap)->canvas, "size-allocate",
G_CALLBACK (size_allocate_cb), satmap);
g_signal_connect (GTK_SAT_MAP (satmap)->canvas, "item_created",
- (GtkSignalFunc) on_item_created, satmap);
+ (GCallback) on_item_created, satmap);
g_signal_connect_after (GTK_SAT_MAP (satmap)->canvas, "realize",
- (GtkSignalFunc) on_canvas_realized, satmap);
+ (GCallback) on_canvas_realized, satmap);
gtk_widget_show (GTK_SAT_MAP (satmap)->canvas);
@@ -875,14 +875,14 @@
if (!goo_canvas_item_model_get_parent (model)) {
/* root item / canvas */
g_signal_connect (item, "motion_notify_event",
- (GtkSignalFunc) on_motion_notify, data);
+ (GCallback) on_motion_notify, data);
}
else if (!g_object_get_data (G_OBJECT (item), "skip-signal-connection")) {
g_signal_connect (item, "button_press_event",
- (GtkSignalFunc) on_button_press, data);
+ (GCallback) on_button_press, data);
g_signal_connect (item, "button_release_event",
- (GtkSignalFunc) on_button_release, data);
+ (GCallback) on_button_release, data);
}
}
Modified: trunk/src/gtk-sat-map.h
===================================================================
--- trunk/src/gtk-sat-map.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-sat-map.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -46,11 +46,11 @@
#define SAT_MAP_RANGE_CIRCLE_POINTS 180 /*!< Number of points used to plot a satellite range half circle. */
-#define GTK_SAT_MAP(obj) GTK_CHECK_CAST (obj, gtk_sat_map_get_type (), GtkSatMap)
-#define GTK_SAT_MAP_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_sat_map_get_type (), GtkSatMapClass)
-#define GTK_IS_SAT_MAP(obj) GTK_CHECK_TYPE (obj, gtk_sat_map_get_type ())
+#define GTK_SAT_MAP(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gtk_sat_map_get_type (), GtkSatMap)
+#define GTK_SAT_MAP_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gtk_sat_map_get_type (), GtkSatMapClass)
+#define GTK_IS_SAT_MAP(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_sat_map_get_type ())
#define GTK_TYPE_SAT_MAP (gtk_sat_map_get_type ())
-#define IS_GTK_SAT_MAP(obj) GTK_CHECK_TYPE (obj, gtk_sat_map_get_type ())
+#define IS_GTK_SAT_MAP(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_sat_map_get_type ())
//typedef struct _GtkSatMap GtkSatMap;
@@ -169,7 +169,7 @@
};
-GtkType gtk_sat_map_get_type (void);
+GType gtk_sat_map_get_type (void);
GtkWidget* gtk_sat_map_new (GKeyFile *cfgdata,
GHashTable *sats,
qth_t *qth);
Modified: trunk/src/gtk-sat-module.h
===================================================================
--- trunk/src/gtk-sat-module.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-sat-module.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -72,15 +72,15 @@
#define GTK_TYPE_SAT_MODULE (gtk_sat_module_get_type ())
-#define GTK_SAT_MODULE(obj) GTK_CHECK_CAST (obj,\
+#define GTK_SAT_MODULE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj,\
gtk_sat_module_get_type (), \
GtkSatModule)
-#define GTK_SAT_MODULE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+#define GTK_SAT_MODULE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass,\
gtk_sat_module_get_type (),\
GtkSatModuleClass)
-#define IS_GTK_SAT_MODULE(obj) GTK_CHECK_TYPE (obj, gtk_sat_module_get_type ())
+#define IS_GTK_SAT_MODULE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_sat_module_get_type ())
typedef struct _gtk_sat_module GtkSatModule;
@@ -165,7 +165,7 @@
};
-GtkType gtk_sat_module_get_type (void);
+GType gtk_sat_module_get_type (void);
GtkWidget* gtk_sat_module_new (const gchar *cfgfile);
Modified: trunk/src/gtk-sat-selector.h
===================================================================
--- trunk/src/gtk-sat-selector.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-sat-selector.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -61,15 +61,15 @@
#define GTK_TYPE_SAT_SELECTOR (gtk_sat_selector_get_type ())
-#define GTK_SAT_SELECTOR(obj) GTK_CHECK_CAST (obj,\
+#define GTK_SAT_SELECTOR(obj) G_TYPE_CHECK_INSTANCE_CAST (obj,\
gtk_sat_selector_get_type (),\
GtkSatSelector)
-#define GTK_SAT_SELECTOR_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+#define GTK_SAT_SELECTOR_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass,\
gtk_sat_selector_get_type (),\
GtkSatSelectorClass)
-#define IS_GTK_SAT_SELECTOR(obj) GTK_CHECK_TYPE (obj, gtk_sat_selector_get_type ())
+#define IS_GTK_SAT_SELECTOR(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_sat_selector_get_type ())
/** \brief The GtkSatSelector structure */
@@ -99,7 +99,7 @@
};
-GtkType gtk_sat_selector_get_type (void);
+GType gtk_sat_selector_get_type (void);
GtkWidget *gtk_sat_selector_new (guint flags);
guint32 gtk_sat_selector_get_flags (GtkSatSelector *selector);
void gtk_sat_selector_get_selected (GtkSatSelector *selector, gint *catnum, gchar **satname, gdouble *epoch);
Modified: trunk/src/gtk-sat-tree.h
===================================================================
--- trunk/src/gtk-sat-tree.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-sat-tree.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -62,15 +62,15 @@
#define GTK_TYPE_SAT_TREE (gtk_sat_tree_get_type ())
-#define GTK_SAT_TREE(obj) GTK_CHECK_CAST (obj,\
+#define GTK_SAT_TREE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj,\
gtk_sat_tree_get_type (),\
GtkSatTree)
-#define GTK_SAT_TREE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+#define GTK_SAT_TREE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass,\
gtk_sat_tree_get_type (),\
GtkSatTreeClass)
-#define IS_GTK_SAT_TREE(obj) GTK_CHECK_TYPE (obj, gtk_sat_tree_get_type ())
+#define IS_GTK_SAT_TREE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_sat_tree_get_type ())
/** \brief The GtkSatTree structure */
@@ -96,7 +96,7 @@
};
-GtkType gtk_sat_tree_get_type (void);
+GType gtk_sat_tree_get_type (void);
GtkWidget *gtk_sat_tree_new (guint flags);
guint32 gtk_sat_tree_get_flags (GtkSatTree *tree);
void gtk_sat_tree_select (GtkSatTree *sat_tree, guint catnum);
Modified: trunk/src/gtk-single-sat.h
===================================================================
--- trunk/src/gtk-single-sat.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-single-sat.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -100,15 +100,15 @@
#define GTK_TYPE_SINGLE_SAT (gtk_single_sat_get_type ())
-#define GTK_SINGLE_SAT(obj) GTK_CHECK_CAST (obj,\
+#define GTK_SINGLE_SAT(obj) G_TYPE_CHECK_INSTANCE_CAST (obj,\
gtk_single_sat_get_type (),\
GtkSingleSat)
-#define GTK_SINGLE_SAT_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+#define GTK_SINGLE_SAT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass,\
gtk_single_sat_get_type (),\
GtkSingleSatClass)
-#define IS_GTK_SINGLE_SAT(obj) GTK_CHECK_TYPE (obj, gtk_single_sat_get_type ())
+#define IS_GTK_SINGLE_SAT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_single_sat_get_type ())
typedef struct _gtk_single_sat GtkSingleSat;
@@ -152,7 +152,7 @@
-GtkType gtk_single_sat_get_type (void);
+GType gtk_single_sat_get_type (void);
GtkWidget* gtk_single_sat_new (GKeyFile *cfgdata,
GHashTable *sats,
qth_t *qth,
Modified: trunk/src/gtk-sky-glance.c
===================================================================
--- trunk/src/gtk-sky-glance.c 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-sky-glance.c 2011-07-31 12:26:07 UTC (rev 880)
@@ -114,7 +114,7 @@
static GtkVBoxClass *parent_class = NULL;
-GtkType
+GType
gtk_sky_glance_get_type ()
{
static GType gtk_sky_glance_type = 0;
@@ -303,9 +303,9 @@
g_signal_connect (GTK_SKY_GLANCE (skg)->canvas, "size-allocate",
G_CALLBACK (size_allocate_cb), skg);
g_signal_connect (GTK_SKY_GLANCE (skg)->canvas, "item_created",
- (GtkSignalFunc) on_item_created, skg);
+ (GCallback) on_item_created, skg);
g_signal_connect_after (GTK_SKY_GLANCE (skg)->canvas, "realize",
- (GtkSignalFunc) on_canvas_realized, skg);
+ (GCallback) on_canvas_realized, skg);
gtk_widget_show (GTK_SKY_GLANCE (skg)->canvas);
@@ -691,14 +691,14 @@
if (!goo_canvas_item_model_get_parent (model)) {
/* root item / canvas */
- g_signal_connect (item, "motion_notify_event", (GtkSignalFunc) on_motion_notify, data);
+ g_signal_connect (item, "motion_notify_event", (GCallback) on_motion_notify, data);
}
else if (!g_object_get_data (G_OBJECT (item), "skip-signal-connection")) {
- //g_signal_connect (item, "button_press_event", (GtkSignalFunc) on_button_press, data);
- g_signal_connect (item, "button_release_event", (GtkSignalFunc) on_button_release, data);
- g_signal_connect (item, "enter_notify_event", (GtkSignalFunc) on_mouse_enter, data);
- g_signal_connect (item, "leave_notify_event", (GtkSignalFunc) on_mouse_leave, data);
+ //g_signal_connect (item, "button_press_event", (GCallback) on_button_press, data);
+ g_signal_connect (item, "button_release_event", (GCallback) on_button_release, data);
+ g_signal_connect (item, "enter_notify_event", (GCallback) on_mouse_enter, data);
+ g_signal_connect (item, "leave_notify_event", (GCallback) on_mouse_leave, data);
}
}
Modified: trunk/src/gtk-sky-glance.h
===================================================================
--- trunk/src/gtk-sky-glance.h 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/gtk-sky-glance.h 2011-07-31 12:26:07 UTC (rev 880)
@@ -43,11 +43,11 @@
-#define GTK_SKY_GLANCE(obj) GTK_CHECK_CAST (obj, gtk_sky_glance_get_type (), GtkSkyGlance)
-#define GTK_SKY_GLANCE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_sky_glance_get_type (), GtkSkyGlanceClass)
-#define GTK_IS_SKY_GLANCE(obj) GTK_CHECK_TYPE (obj, gtk_sky_glance_get_type ())
+#define GTK_SKY_GLANCE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gtk_sky_glance_get_type (), GtkSkyGlance)
+#define GTK_SKY_GLANCE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gtk_sky_glance_get_type (), GtkSkyGlanceClass)
+#define GTK_IS_SKY_GLANCE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_sky_glance_get_type ())
#define GTK_TYPE_SKY_GLANCE (gtk_sky_glance_get_type ())
-#define IS_GTK_SKY_GLANCE(obj) GTK_CHECK_TYPE (obj, gtk_sky_glance_get_type ())
+#define IS_GTK_SKY_GLANCE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_sky_glance_get_type ())
typedef struct _GtkSkyGlance GtkSkyGlance;
typedef struct _GtkSkyGlanceClass GtkSkyGlanceClass;
@@ -113,7 +113,7 @@
-GtkType gtk_sky_glance_get_type (void);
+GType gtk_sky_glance_get_type (void);
GtkWidget* gtk_sky_glance_new (GHashTable *sats, qth_t *qth, gdouble ts);
/*
Modified: trunk/src/mod-mgr.c
===================================================================
--- trunk/src/mod-mgr.c 2011-07-30 23:24:01 UTC (rev 879)
+++ trunk/src/mod-mgr.c 2011-07-31 12:26:07 UTC (rev 880)
@@ -76,7 +76,7 @@
static void update_window_title (void);
static void switch_page_cb (GtkNotebook *notebook,
- GtkNotebookPage *page,
+ gpointer *page,
guint page_num,
gpointer user_data);
@@ -571,7 +571,7 @@
}
static void switch_page_cb (GtkNotebook *notebook,
- GtkNotebookPage *page,
+ gpointer *page,
guint page_num,
gpointer user_data)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
