Converting Ridge and Radar plugins to use GObject

[grits] / src / plugin-radar.h

diff --git a/src/plugin-radar.h b/src/plugin-radar.h
index 2bc422aac026402874201be0256a230358a22345..5cc5011b42cd822d98e445a93b30931382b35654 100644 (file)
--- a/src/plugin-radar.h
+++ b/src/plugin-radar.h
@@ -18,13 +18,45 @@
 #ifndef __RADAR_H__
 #define __RADAR_H__
 
-gboolean radar_init(AWeatherGui *gui);
+#include <glib-object.h>
+#include <rsl.h>
 
+/* TODO: convert */
 typedef struct {
        char *name;
        guint8 data[256][4];
 } colormap_t;
-
 extern colormap_t colormaps[];
 
+#define AWEATHER_TYPE_RADAR            (aweather_radar_get_type ())
+#define AWEATHER_RADAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   AWEATHER_TYPE_RADAR, AWeatherRadar))
+#define AWEATHER_IS_RADAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   AWEATHER_TYPE_RADAR))
+#define AWEATHER_RADAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), AWEATHER_TYPE_RADAR, AWeatherRadarClass))
+#define AWEATHER_IS_RADAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), AWEATHER_TYPE_RADAR))
+#define AWEATHER_RADAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   AWEATHER_TYPE_RADAR, AWeatherRadarClass))
+
+typedef struct _AWeatherRadar        AWeatherRadar;
+typedef struct _AWeatherRadarClass   AWeatherRadarClass;
+
+struct _AWeatherRadar {
+       GObject parent_instance;
+
+       /* instance members */
+       AWeatherGui *gui;
+       GtkWidget   *config_body;
+       Radar       *cur_radar;
+       Sweep       *cur_sweep; // make this not global
+       colormap_t  *cur_colormap;
+       guint        cur_sweep_tex;
+};
+
+struct _AWeatherRadarClass {
+       GObjectClass parent_class;
+};
+
+GType aweather_radar_get_type();
+
+/* Methods */
+AWeatherRadar *aweather_radar_new(AWeatherGui *gui);
+
 #endif