libgis -> grits: Update everything

[aweather] / src / plugins / level2.h

diff --git a/src/plugins/level2.h b/src/plugins/level2.h
index 3577ed52bab0c9f1d41d0ff5dbdd0f0b8d84a8c2..ee4d3ba284c792e6a2afa1ce32219232fadb0cbc 100644 (file)
--- a/src/plugins/level2.h
+++ b/src/plugins/level2.h
@@ -18,41 +18,49 @@
 #ifndef __AWEATHER_LEVEL2_H__
 #define __AWEATHER_LEVEL2_H__
 
-#include <gis.h>
+#include <grits.h>
 #include "aweather-colormap.h"
 
 /* Level2 */
-#define AWEATHER_TYPE_LEVEL2 (aweather_level2_get_type())
+#define AWEATHER_TYPE_LEVEL2            (aweather_level2_get_type())
+#define AWEATHER_LEVEL2(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   AWEATHER_TYPE_LEVEL2, AWeatherLevel2))
+#define AWEATHER_IS_LEVEL2(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   AWEATHER_TYPE_LEVEL2))
+#define AWEATHER_LEVEL2_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), AWEATHER_TYPE_LEVEL2, AWeatherLevel2Class))
+#define AWEATHER_IS_LEVEL2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), AWEATHER_TYPE_LEVEL2))
+#define AWEATHER_LEVEL2_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   AWEATHER_TYPE_LEVEL2, AWeatherLevel2Class))
 
-GOBJECT_HEAD(
-       AWEATHER, LEVEL2,
-       AWeather, Level2,
-       aweather, level2);
+typedef struct _AWeatherLevel2      AWeatherLevel2;
+typedef struct _AWeatherLevel2Class AWeatherLevel2Class;
 
 struct _AWeatherLevel2 {
-       GisCallback       parent;
-       GisViewer        *viewer;
+       GritsObject       parent;
+       GritsViewer      *viewer;
        Radar            *radar;
        AWeatherColormap *colormap;
 
        /* Private */
        Sweep            *sweep;
        AWeatherColormap *sweep_colors;
+       gdouble           sweep_coords[2];
        guint             sweep_tex;
 };
 
 struct _AWeatherLevel2Class {
-       GisCallbackClass parent_class;
+       GritsObjectClass parent_class;
 };
 
-AWeatherLevel2 *aweather_level2_new(GisViewer *viewer,
+GType aweather_level2_get_type(void);
+
+AWeatherLevel2 *aweather_level2_new(GritsViewer *viewer,
                AWeatherColormap *colormap, Radar *radar);
 
-AWeatherLevel2 *aweather_level2_new_from_file(GisViewer *viewer,
+AWeatherLevel2 *aweather_level2_new_from_file(GritsViewer *viewer,
                AWeatherColormap *colormap,
                const gchar *file, const gchar *site);
 
 void aweather_level2_set_sweep(AWeatherLevel2 *level2,
                int type, float elev);
 
+GtkWidget *aweather_level2_get_config(AWeatherLevel2 *level2);
+
 #endif