Splitting GIS into a shared library, and a lot more

[grits] / src / aweather-gui.h

diff --git a/src/aweather-gui.h b/src/aweather-gui.h
index af5e4a8243905906778e74c44fce4653741373a5..eb28a55307fca65f09e81df55620215e7dc3460c 100644 (file)
--- a/src/aweather-gui.h
+++ b/src/aweather-gui.h
@@ -20,8 +20,8 @@
 
 #include <gtk/gtk.h>
 #include <glib-object.h>
-#include "aweather-view.h"
-#include "aweather-plugin.h"
+
+#include <gis/gis.h>
 
 /* Type macros */
 #define AWEATHER_TYPE_GUI            (aweather_gui_get_type())
@@ -38,9 +38,13 @@ struct _AWeatherGui {
        GtkWindow parent_instance;
 
        /* instance members */
-       AWeatherView   *view;
-       GtkBuilder     *builder;
-       GList          *plugins;
+       GtkBuilder   *builder;
+       GisWorld     *world;
+       GisView      *view;
+       GisOpenGL    *opengl;
+       GisPlugins   *plugins;
+       GisPrefs     *prefs;
+       GtkListStore *gtk_plugins;
 };
 
 struct _AWeatherGuiClass {
@@ -52,13 +56,16 @@ struct _AWeatherGuiClass {
 GType aweather_gui_get_type(void);
 
 /* Methods */
-AWeatherGui    *aweather_gui_new();
-AWeatherView   *aweather_gui_get_view(AWeatherGui *gui);
-GtkWidget      *aweather_gui_get_widget(AWeatherGui *gui, const gchar *name);
-void            aweather_gui_register_plugin(AWeatherGui *gui, AWeatherPlugin *plugin);
-void            aweather_gui_gl_redraw(AWeatherGui *gui);
-void            aweather_gui_gl_begin(AWeatherGui *gui);
-void            aweather_gui_gl_end(AWeatherGui *gui);
-void            aweather_gui_gl_flush(AWeatherGui *gui);
+AWeatherGui *aweather_gui_new();
+
+GisWorld    *aweather_gui_get_world(AWeatherGui *gui);
+GisOpenGL   *aweather_gui_get_opengl(AWeatherGui *gui);
+GisView     *aweather_gui_get_view(AWeatherGui *gui);
+
+GtkWidget   *aweather_gui_get_widget(AWeatherGui *gui, const gchar *name);
+GObject     *aweather_gui_get_object(AWeatherGui *gui, const gchar *name);
+
+void         aweather_gui_attach_plugin(AWeatherGui *self, const gchar *name);
+void         aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name);
 
 #endif