2001-11-13 Michael Meeks <michael@ximian.com>

[platform/core/uifw/at-spi2-atk.git] / libspi / desktop.h

diff --git a/libspi/desktop.h b/libspi/desktop.h
index bdbd978..fd94c28 100644 (file)
--- a/libspi/desktop.h
+++ b/libspi/desktop.h
@@ -20,8 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef DESKTOP_H_
-#define DESKTOP_H_
+#ifndef SPI_DESKTOP_H_
+#define SPI_DESKTOP_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -29,34 +29,33 @@ extern "C" {
 
 #include <bonobo/bonobo-xobject.h>
 #include <atk/atkobject.h>
-#include <atksimpleobject.h>
 #include <accessible.h>
 #include <application.h>
-#include <Desktop.h>
+#include <libspi/Accessibility.h>
 
-#define DESKTOP_TYPE        (desktop_get_type ())
-#define DESKTOP(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), DESKTOP_TYPE, Desktop))
-#define DESKTOP_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), DESKTOP_TYPE, DesktopClass))
-#define IS_DESKTOP(o)       (G_TYPE_CHECK__INSTANCE_TYPE ((o), DESKTOP_TYPE))
-#define IS_DESKTOP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DESKTOP_TYPE))
+#define SPI_DESKTOP_TYPE        (spi_desktop_get_type ())
+#define SPI_DESKTOP(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_DESKTOP_TYPE, SpiDesktop))
+#define SPI_DESKTOP_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), SPI_DESKTOP_TYPE, SpiDesktopClass))
+#define IS_SPI_DESKTOP(o)       (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_DESKTOP_TYPE))
+#define IS_SPI_DESKTOP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_DESKTOP_TYPE))
 
 typedef struct {
-        Accessible parent;
+        SpiAccessible parent;
         GList *applications; /* TODO: maybe change this so it's generated on-demand ? */
-} Desktop;
+} SpiDesktop;
 
 typedef struct {
-        AccessibleClass parent_class;
+        SpiAccessibleClass parent_class;
         POA_Accessibility_Desktop__epv epv;
-} DesktopClass;
+} SpiDesktopClass;
 
-GType               desktop_get_type           (void);
-void                desktop_add_application    (Application *app);
-void                desktop_remove_application (Application *app);
-Desktop             *desktop_new               (void);
+GType               spi_desktop_get_type           (void);
+void                spi_desktop_add_application    (SpiApplication *app);
+void                spi_desktop_remove_application (SpiApplication *app);
+SpiDesktop             *spi_desktop_new               (void);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* DESKTOP_H_ */
+#endif /* SPI_DESKTOP_H_ */