Convert GtkBox and GtkScale to GTK 3 version

[aweather] / src / aweather-gui.h

diff --git a/src/aweather-gui.h b/src/aweather-gui.h
index 476cab18ac7201c9d370266dd85b78ad641e0ddf..c1c76bebd0c283f67d4bd3e7b99385c64fd94a85 100644 (file)
--- a/src/aweather-gui.h
+++ b/src/aweather-gui.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2011 Andy Spencer <andy753421@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,10 +20,8 @@
 
 #include <gtk/gtk.h>
 #include <glib-object.h>
-#include "gis-opengl.h"
-#include "gis-world.h"
-#include "gis-view.h"
-#include "aweather-plugin.h"
+
+#include <grits.h>
 
 /* Type macros */
 #define AWEATHER_TYPE_GUI            (aweather_gui_get_type())
@@ -40,13 +38,12 @@ struct _AWeatherGui {
        GtkWindow parent_instance;
 
        /* instance members */
-       GtkBuilder *builder;
-       GisWorld   *world;
-       GisView    *view;
-       GisOpenGL  *opengl;
-       GList      *plugins;
-       GKeyFile   *prefs;
+       GtkBuilder   *builder;
+       GritsViewer  *viewer;
+       GritsPlugins *plugins;
+       GritsPrefs   *prefs;
        GtkListStore *gtk_plugins;
+       guint         update_source;
 };
 
 struct _AWeatherGuiClass {
@@ -60,14 +57,12 @@ GType aweather_gui_get_type(void);
 /* Methods */
 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);
+GritsViewer *aweather_gui_get_viewer(AWeatherGui *gui);
 
 GtkWidget   *aweather_gui_get_widget(AWeatherGui *gui, const gchar *name);
 GObject     *aweather_gui_get_object(AWeatherGui *gui, const gchar *name);
 
-gboolean     aweather_gui_load_plugin(AWeatherGui *gui, const gchar *name);
-gboolean     aweather_gui_unload_plugin(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