Commit b8be6ac6 authored by Paolo Borelli's avatar Paolo Borelli

Fix compilation on linux... hopefully without breaking on windows.

parent 99aef79f
2003-11-05 Paolo Borelli <pborelli@katamail.com>
* src/glade-placeholder.[ch]: move typedefs to glade-types.h to fix
compilation on linux. Remove add_method_to_class since it's not needed.
* src/glade-xml-utils.h: move typedefs to glade-types.h
* src/glade-types.h: add mentioned types.
* src/glade-widget-class.h: remove forward decls, include glade-types.
* src/glade-widget.h: ditto.
2003-11-02 Joaquin Cuenca Abela <e98cuenc@yahoo.com>
* src/glade-placeholder.[ch]: rewrite it as a GtkWidget. Moved some
......
......@@ -29,6 +29,7 @@
#include "glade-popup.h"
#include "glade-utils.h"
static void glade_placeholder_class_init (GladePlaceholderClass *klass);
static void glade_placeholder_init (GladePlaceholder *placeholder);
static void glade_placeholder_destroy (GtkObject *object);
......@@ -93,6 +94,8 @@ glade_placeholder_class_init (GladePlaceholderClass *klass)
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
object_class->destroy = glade_placeholder_destroy;
widget_class->realize = glade_placeholder_realize;
......@@ -261,8 +264,3 @@ glade_placeholder_button_press (GtkWidget *widget, GdkEventButton *event)
return TRUE;
}
/* TODO: Remove me. Put me on a glade_utils... or glade_widget_class... */
void glade_placeholder_add_methods_to_class (GladeWidgetClass *class)
{
}
......@@ -33,9 +33,7 @@
#include <gtk/gtkwidget.h>
#include "glade-types.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
G_BEGIN_DECLS
#define GLADE_TYPE_PLACEHOLDER (glade_placeholder_get_type ())
......@@ -46,9 +44,6 @@ extern "C" {
#define GLADE_PLACEHOLDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_PLACEHOLDER, GladePlaceholderClass))
typedef struct _GladePlaceholder GladePlaceholder;
typedef struct _GladePlaceholderClass GladePlaceholderClass;
struct _GladePlaceholder
{
GtkWidget widget;
......@@ -62,15 +57,11 @@ struct _GladePlaceholderClass
};
GType glade_placeholder_get_type (void) G_GNUC_CONST;
GtkWidget* glade_placeholder_new (void);
GType glade_placeholder_get_type (void) G_GNUC_CONST;
/* TODO: Remove me */
void glade_placeholder_add_methods_to_class (GladeWidgetClass *class);
GtkWidget *glade_placeholder_new (void);
#ifdef __cplusplus
}
#endif /* __cplusplus */
G_END_DECLS
#endif /* __GLADE_PLACEHOLDER_H__ */
......@@ -29,5 +29,11 @@ typedef struct _GladeCatalog GladeCatalog;
typedef struct _GladeCursor GladeCursor;
typedef struct _GladePlaceholder GladePlaceholder;
typedef struct _GladePlaceholderClass GladePlaceholderClass;
typedef struct _GladeXmlContext GladeXmlContext;
typedef struct _GladeXmlNode GladeXmlNode;
typedef struct _GladeXmlDoc GladeXmlDoc;
#endif /* __GLADE_TYPES_H__ */
......@@ -3,12 +3,10 @@
#define __GLADE_WIDGET_CLASS_H__
#include <gmodule.h>
#include "glade-types.h"
G_BEGIN_DECLS
/* fwd. decl. */
struct _GladeXmlNode;
typedef struct _GladeXmlNode GladeXmlNode;
typedef enum {
GLADE_TOPLEVEL = 1 << 2,
......
......@@ -2,23 +2,10 @@
#ifndef __GLADE_WIDGET_H__
#define __GLADE_WIDGET_H__
#include "glade-types.h"
G_BEGIN_DECLS
/* forward declarations */
struct _GladeWidgetClass;
typedef struct _GladeWidgetClass GladeWidgetClass;
struct _GladeProject;
typedef struct _GladeProject GladeProject;
struct _GtkWidget;
typedef struct _GtkWidget GtkWidget;
struct _GList;
typedef struct _GList GList;
struct _GladePropertyClass;
typedef struct _GladePropertyClass GladePropertyClass;
struct _GladeXmlNode;
typedef struct _GladeXmlNode GladeXmlNode;
struct _GladeXmlContext;
typedef struct _GladeXmlContext GladeXmlContext;
#define GLADE_WIDGET(w) ((GladeWidget *)w)
#define GLADE_IS_WIDGET(w) (w != NULL)
......@@ -122,8 +109,8 @@ void glade_widget_remove_signal (GladeWidget *widget, GladeSignal *signal);
/* Xml saving & reading */
GladeXmlNode * glade_widget_write (GladeXmlContext *context, GladeWidget *widget);
GladeWidget * glade_widget_new_from_node (GladeXmlNode *node, GladeProject *project);
GladeXmlNode *glade_widget_write (GladeXmlContext *context, GladeWidget *widget);
GladeWidget *glade_widget_new_from_node (GladeXmlNode *node, GladeProject *project);
G_END_DECLS
......
......@@ -3,14 +3,14 @@
#ifndef __GLADE_XML_UTILS_H__
#define __GLADE_XML_UTILS_H__
#include "glade-types.h"
G_BEGIN_DECLS
#define GLADE_XML_CONTEXT(c) ((GladeXmlContext *)c)
#define GLADE_XML_IS_CONTEXT(c) (c != NULL)
typedef struct _GladeXmlContext GladeXmlContext;
typedef struct _GladeXmlNode GladeXmlNode;
typedef struct _GladeXmlDoc GladeXmlDoc;
/* search child */
GladeXmlNode * glade_xml_search_child (GladeXmlNode * node, const char *name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment