[Monodevelop-patches-list] r793 - in trunk/MonoDevelop: . build/bin gdldock/gdl gdldock/sources gdldock/sources/gdl
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Thu Feb 5 16:16:12 EST 2004
Author: ggiraldez
Date: 2004-02-05 16:16:11 -0500 (Thu, 05 Feb 2004)
New Revision: 793
Added:
trunk/MonoDevelop/gdldock/sources/gdl/gdl-i18n.h
trunk/MonoDevelop/gdldock/sources/gdl/gdl-tools.h
trunk/MonoDevelop/gdldock/sources/gdl/layout.glade
trunk/MonoDevelop/gdldock/sources/gdl/libgdlmarshal.list
Modified:
trunk/MonoDevelop/Makefile
trunk/MonoDevelop/build/bin/
trunk/MonoDevelop/gdldock/gdl/gdl-api.xml
trunk/MonoDevelop/gdldock/sources/Makefile
trunk/MonoDevelop/gdldock/sources/gdl-sharp-sources.xml
trunk/MonoDevelop/gdldock/sources/gdl/
trunk/MonoDevelop/gdldock/sources/gdl/Makefile
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item-grip.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-layout.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-master.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-notebook.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-object.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-paned.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-placeholder.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-tablabel.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock.c
trunk/MonoDevelop/monodevelop
Log:
Build GdlDock library and bindings.
Add build/bin to LD_LIBRARY_PATH so we can find libgdldock.so
Modified: trunk/MonoDevelop/Makefile
===================================================================
--- trunk/MonoDevelop/Makefile 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/Makefile 2004-02-05 21:16:11 UTC (rev 793)
@@ -1,9 +1,10 @@
PROGRAM=build/bin/MonoDevelop.exe
MONOPAD=build/bin/MonoPad.exe
GTKMOZEMBED=build/bin/gtkmozembed-sharp.dll
+GDLDOCK=build/bin/gdl-sharp.dll
QMAKE=@ $(MAKE)
-$(PROGRAM): $(GTKMOZEMBED) MonoDevelop.Base MonoDevelop.EditorBindings MonoDevelop.DefaultTexteditor SourceEditor CSharpBinding StartPage
+$(PROGRAM): $(GTKMOZEMBED) $(GDLDOCK) MonoDevelop.Base MonoDevelop.EditorBindings MonoDevelop.DefaultTexteditor SourceEditor CSharpBinding StartPage
@ echo Building $@
$(QMAKE) -C src/Main/StartUp
@@ -11,6 +12,10 @@
@ echo Building $@
$(QMAKE) -C gtkmozembed-sharp
+$(GDLDOCK):
+ @ echo Building $@
+ $(QMAKE) -C gdldock
+
$(MONOPAD): MonoDevelop.TextEditor
@ echo Building $@
$(QMAKE) -C samples/MonoPad
Property changes on: trunk/MonoDevelop/build/bin
___________________________________________________________________
Name: svn:ignore
- *.exe
*.dll
+ *.exe
*.dll
libgdldock.so
Modified: trunk/MonoDevelop/gdldock/gdl/gdl-api.xml
===================================================================
--- trunk/MonoDevelop/gdldock/gdl/gdl-api.xml 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/gdl/gdl-api.xml 2004-02-05 21:16:11 UTC (rev 793)
@@ -5,7 +5,7 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
- <namespace name="Gdl" library="gdl-1">
+ <namespace name="Gdl" library="gdldock">
<enum name="DockItemBehavior" cname="GdlDockItemBehavior" type="flags">
<member cname="GDL_DOCK_ITEM_BEH_NORMAL" name="Normal" />
<member cname="GDL_DOCK_ITEM_BEH_NEVER_FLOATING" name="NeverFloating" value="1 << 0" />
@@ -222,6 +222,9 @@
<field cname="item" type="GdlDockItem*" />
<signal name="Activate" cname="activate" when="LAST">
<return-type type="GCclosureMarshalVoid_Void" />
+ <parameters>
+ <parameter name="inst" type="GdlDockItemGrip*" />
+ </parameters>
</signal>
<method name="GetType" cname="gdl_dock_item_grip_get_type" shared="true">
<return-type type="GType" />
Modified: trunk/MonoDevelop/gdldock/sources/Makefile
===================================================================
--- trunk/MonoDevelop/gdldock/sources/Makefile 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/Makefile 2004-02-05 21:16:11 UTC (rev 793)
@@ -2,6 +2,7 @@
PERLLIB = $(PREFIX)/share/perl5
all:
+ cd gdl && make
api: gdl/*.h
gapi-parser gdl-sharp-sources.xml
Property changes on: trunk/MonoDevelop/gdldock/sources/gdl
___________________________________________________________________
Name: svn:ignore
+ libgdldock.so
libgdltypebuiltins.*
libgdlmarshal.*
Modified: trunk/MonoDevelop/gdldock/sources/gdl/Makefile
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/Makefile 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/Makefile 2004-02-05 21:16:11 UTC (rev 793)
@@ -1,13 +1,20 @@
+srcdir = .
+
+CFLAGS = -g -Wall -O2
+LDFLAGS = -g -shared
+
+GLIB_GENMARSHAL = $(shell which glib-genmarshal)
+GLIB_MKENUMS = $(shell which glib-mkenums)
+
+GDL_REQUIREMENTS = gtk+-2.0 libglade-2.0 libxml-2.0
+GDL_DEPENDENCIES_CFLAGS = $(shell pkg-config --cflags $(GDL_REQUIREMENTS))
+GDL_DEPENDENCIES_LIBS = $(shell pkg-config --libs $(GDL_REQUIREMENTS))
+
INCLUDES = \
- -DG_LOG_DOMAIN=\"Gdl\" \
- -I$(includedir) -I$(top_srcdir) \
- $(WARN_CFLAGS) $(DEPRECATED_FLAGS) \
- $(GDL_DEPENDENCIES_CFLAGS) $(XML_CFLAGS)
+ -DG_LOG_DOMAIN=\"GdlDock\" -I.. -I. \
+ $(GDL_DEPENDENCIES_CFLAGS)
-lib_LTLIBRARIES = libgdl-1.la
-
-libgdl_headers = \
- gdl.h \
+libgdldock_headers = \
gdl-dock-object.h \
gdl-dock-master.h \
gdl-dock.h \
@@ -19,8 +26,9 @@
gdl-dock-layout.h \
gdl-dock-placeholder.h \
-libgdl_1_la_SOURCES = \
- $(libgdl_headers) \
+libgdldock_SOURCES = \
+ $(libgdldock_headers) \
+ gdl-i18n.h \
gdl-dock-object.c \
gdl-dock-master.c \
gdl-dock.c \
@@ -31,8 +39,77 @@
gdl-dock-tablabel.c \
gdl-dock-layout.c \
gdl-dock-placeholder.c \
+ libgdltypebuiltins.c \
+ libgdlmarshal.c
-libgdl_1_la_LIBADD = \
- $(GDL_DEPENDENCIES_LIBS) \
- $(XML_LIBS)
+libgdldock_OBJECTS = $(filter-out %.h,$(patsubst %.c,%.o,$(libgdldock_SOURCES)))
+GENERATED_SOURCES = \
+ libgdltypebuiltins.h \
+ libgdltypebuiltins.c \
+ libgdlmarshal.h \
+ libgdlmarshal.c
+
+all: libgdldock.so
+
+$(libgdldock_OBJECTS): $(libgdldock_headers) libgdltypebuiltins.h libgdlmarshal.h
+
+libgdldock.so: $(libgdldock_OBJECTS)
+ $(CC) $(LDFLAGS) -shared -fPIC -o libgdldock.so $+ && \
+ cp libgdldock.so ../../../build/bin
+
+%.o: %.c
+ $(CC) $(CFLAGS) $(INCLUDES) -c $<
+
+# enumerations code generation
+
+libgdltypebuiltins.c: $(libgdldock_headers)
+ $(GLIB_MKENUMS) \
+ --fhead "#include <glib-object.h>\n" \
+ --fhead "#include \"libgdltypebuiltins.h\"\n\n" \
+ --fprod "\n/* enumerations from \"@filename@\" */" \
+ --vhead "static const G at Type@Value _ at enum_name@_values[] = {" \
+ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+ --vtail " { 0, NULL, NULL }\n};\n\n" \
+ --vtail "GType\n at enum_name@_get_type (void)\n{\n" \
+ --vtail " static GType type = 0;\n\n" \
+ --vtail " if (!type)\n" \
+ --vtail " type = g_ at type@_register_static (\"@EnumName@\", _ at enum_name@_values);\n\n" \
+ --vtail " return type;\n}\n\n" \
+ $(libgdldock_headers) > xgen-gtbec \
+ && cp xgen-gtbec $(@F) \
+ && rm -f xgen-gtbec
+
+libgdltypebuiltins.h: $(libgdldock_headers)
+ $(GLIB_MKENUMS) \
+ --fhead "#ifndef __LIBGDLTYPEBUILTINS_H__\n" \
+ --fhead "#define __LIBGDLTYPEBUILTINS_H__ 1\n\n" \
+ --fhead "#include <gdl/gdl-dock.h>\n\n" \
+ --fhead "G_BEGIN_DECLS\n\n" \
+ --ftail "G_END_DECLS\n\n" \
+ --ftail "#endif /* __LIBGDLTYPEBUILTINS_H__ */\n" \
+ --fprod "\n/* --- @filename@ --- */" \
+ --eprod "#define GDL_TYPE_ at ENUMSHORT@ @enum_name at _get_type()\n" \
+ --eprod "GType @enum_name at _get_type (void);\n" \
+ $(libgdldock_headers) > xgen-gth \
+ && cp xgen-gth $(@F) \
+ && rm -f xgen-gth
+
+libgdlmarshal.h: libgdlmarshal.list
+ $(GLIB_GENMARSHAL) \
+ --prefix=gdl_marshal $(srcdir)/libgdlmarshal.list --header > xgen-gmc \
+ && cp xgen-gmc $(@F) \
+ && rm -f xgen-gmc
+
+libgdlmarshal.c: libgdlmarshal.h
+ echo "#include \"libgdlmarshal.h\"" > xgen-gmc && \
+ $(GLIB_GENMARSHAL) \
+ --prefix=gdl_marshal $(srcdir)/libgdlmarshal.list --body >> xgen-gmc \
+ && cp xgen-gmc $(@F) \
+ && rm -f xgen-gmc
+
+
+clean:
+ rm -f libgdldock.so $(libgdldock_OBJECTS) $(GENERATED_SOURCES)
+
+.PHONY: clean
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item-grip.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item-grip.c 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item-grip.c 2004-02-05 21:16:11 UTC (rev 793)
@@ -21,7 +21,6 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkaccessible.h>
#include <gtk/gtkbindings.h>
-#include <libgnome/gnome-macros.h>
#include "gdl-dock-item.h"
#include "gdl-dock-item-grip.h"
#include "gdl-dock.h"
@@ -35,7 +34,7 @@
};
static guint signals [LAST_SIGNAL];
-GNOME_CLASS_BOILERPLATE (GdlDockItemGrip, gdl_dock_item_grip,
+GDL_CLASS_BOILERPLATE (GdlDockItemGrip, gdl_dock_item_grip,
GtkWidget, GTK_TYPE_WIDGET);
static gint
@@ -273,7 +272,7 @@
static void
gdl_dock_item_grip_dispose (GObject *object)
{
- GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
+ GDL_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
}
static void
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item.c 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item.c 2004-02-05 21:16:11 UTC (rev 793)
@@ -34,10 +34,10 @@
#include "gdl-i18n.h"
#include <string.h>
-#include <libgnome/gnome-macros.h>
#include <gdk/gdkkeysyms.h>
#include "gdl-tools.h"
+#include "gdl-dock-master.h"
#include "gdl-dock.h"
#include "gdl-dock-item.h"
#include "gdl-dock-item-grip.h"
@@ -190,7 +190,7 @@
/* ----- Private functions ----- */
-GNOME_CLASS_BOILERPLATE (GdlDockItem, gdl_dock_item, GdlDockObject, GDL_TYPE_DOCK_OBJECT);
+GDL_CLASS_BOILERPLATE (GdlDockItem, gdl_dock_item, GdlDockObject, GDL_TYPE_DOCK_OBJECT);
static void
gdl_dock_item_class_init (GdlDockItemClass *klass)
@@ -376,7 +376,7 @@
{
GObject *g_object;
- g_object = GNOME_CALL_PARENT_WITH_DEFAULT (G_OBJECT_CLASS,
+ g_object = GDL_CALL_PARENT_WITH_DEFAULT (G_OBJECT_CLASS,
constructor,
(type,
n_construct_properties,
@@ -530,7 +530,7 @@
g_free (priv);
}
- GNOME_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+ GDL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
static void
@@ -853,7 +853,7 @@
if (GTK_WIDGET_DRAWABLE (widget) && event->window == widget->window) {
gdl_dock_item_paint (widget, event);
- GNOME_CALL_PARENT (GTK_WIDGET_CLASS, expose_event, (widget, event));
+ GDL_CALL_PARENT (GTK_WIDGET_CLASS, expose_event, (widget, event));
}
return FALSE;
@@ -989,7 +989,7 @@
if (event_handled)
return TRUE;
else
- return GNOME_CALL_PARENT_WITH_DEFAULT (GTK_WIDGET_CLASS,
+ return GDL_CALL_PARENT_WITH_DEFAULT (GTK_WIDGET_CLASS,
key_press_event,
(widget, event),
FALSE);
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-layout.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-layout.c 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-layout.c 2004-02-05 21:16:11 UTC (rev 793)
@@ -30,13 +30,14 @@
#include <libxml/parser.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
-#include <libgnome/gnome-macros.h>
#include "gdl-dock-layout.h"
#include "gdl-tools.h"
#include "gdl-dock-placeholder.h"
+#define GDL_GLADEDIR "."
+
/* ----- Private variables ----- */
enum {
@@ -110,7 +111,7 @@
/* ----- Private implementation ----- */
-GNOME_CLASS_BOILERPLATE (GdlDockLayout, gdl_dock_layout, GObject, G_TYPE_OBJECT);
+GDL_CLASS_BOILERPLATE (GdlDockLayout, gdl_dock_layout, GObject, G_TYPE_OBJECT);
static void
gdl_dock_layout_class_init (GdlDockLayoutClass *klass)
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-master.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-master.c 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-master.c 2004-02-05 21:16:11 UTC (rev 793)
@@ -27,7 +27,6 @@
#endif
#include "gdl-i18n.h"
-#include <libgnome/gnome-macros.h>
#include <gdk/gdkx.h>
#include "gdl-tools.h"
@@ -117,7 +116,7 @@
/* ----- Private interface ----- */
-GNOME_CLASS_BOILERPLATE (GdlDockMaster, gdl_dock_master, GObject, G_TYPE_OBJECT);
+GDL_CLASS_BOILERPLATE (GdlDockMaster, gdl_dock_master, GObject, G_TYPE_OBJECT);
static void
gdl_dock_master_class_init (GdlDockMasterClass *klass)
@@ -293,7 +292,7 @@
master->_priv = NULL;
}
- GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (g_object));
+ GDL_CALL_PARENT (G_OBJECT_CLASS, dispose, (g_object));
}
static void
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-notebook.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-notebook.c 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-notebook.c 2004-02-05 21:16:11 UTC (rev 793)
@@ -26,7 +26,6 @@
#include "gdl-i18n.h"
#include <gtk/gtknotebook.h>
-#include <libgnome/gnome-macros.h>
#include "gdl-tools.h"
#include "gdl-dock-notebook.h"
@@ -92,7 +91,7 @@
/* ----- Private functions ----- */
-GNOME_CLASS_BOILERPLATE (GdlDockNotebook, gdl_dock_notebook, GdlDockItem, GDL_TYPE_DOCK_ITEM) ;
+GDL_CLASS_BOILERPLATE (GdlDockNotebook, gdl_dock_notebook, GdlDockItem, GDL_TYPE_DOCK_ITEM) ;
static void
gdl_dock_notebook_class_init (GdlDockNotebookClass *klass)
@@ -241,7 +240,7 @@
/* we need to call the virtual first, since in GdlDockDestroy our
children dock objects are detached */
- GNOME_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+ GDL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
/* after that we can remove the GtkNotebook */
if (item->child) {
@@ -310,7 +309,7 @@
if (include_internals) {
/* use GdlDockItem's forall */
- GNOME_CALL_PARENT (GTK_CONTAINER_CLASS, forall,
+ GDL_CALL_PARENT (GTK_CONTAINER_CLASS, forall,
(container, include_internals, callback, callback_data));
}
else {
@@ -397,7 +396,7 @@
}
}
else
- GNOME_CALL_PARENT (GDL_DOCK_OBJECT_CLASS, dock,
+ GDL_CALL_PARENT (GDL_DOCK_OBJECT_CLASS, dock,
(object, requestor, position, other_data));
}
@@ -412,7 +411,7 @@
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (item->child), GTK_POS_LEFT);
}
- GNOME_CALL_PARENT (GDL_DOCK_ITEM_CLASS, set_orientation, (item, orientation));
+ GDL_CALL_PARENT (GDL_DOCK_ITEM_CLASS, set_orientation, (item, orientation));
}
static gboolean
@@ -457,7 +456,7 @@
if (i >= 0)
gtk_notebook_set_current_page (GTK_NOTEBOOK (item->child), i);
- GNOME_CALL_PARENT (GDL_DOCK_OBJECT_CLASS, present, (object, child));
+ GDL_CALL_PARENT (GDL_DOCK_OBJECT_CLASS, present, (object, child));
}
static gboolean
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-object.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-object.c 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-object.c 2004-02-05 21:16:11 UTC (rev 793)
@@ -27,7 +27,6 @@
#endif
#include "gdl-i18n.h"
-#include <libgnome/gnome-macros.h>
#include <stdlib.h>
#include <string.h>
@@ -96,7 +95,7 @@
/* ----- Private interface ----- */
-GNOME_CLASS_BOILERPLATE (GdlDockObject, gdl_dock_object, GtkContainer, GTK_TYPE_CONTAINER);
+GDL_CLASS_BOILERPLATE (GdlDockObject, gdl_dock_object, GtkContainer, GTK_TYPE_CONTAINER);
static void
gdl_dock_object_class_init (GdlDockObjectClass *klass)
@@ -253,7 +252,7 @@
g_free (object->long_name);
object->long_name = NULL;
- GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (g_object));
+ GDL_CALL_PARENT (G_OBJECT_CLASS, finalize, (g_object));
}
static void
@@ -290,7 +289,7 @@
if (object->master)
gdl_dock_object_unbind (object);
- GNOME_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (gtk_object));
+ GDL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (gtk_object));
}
static void
@@ -311,7 +310,7 @@
(GtkCallback) gdl_dock_object_foreach_automatic,
gtk_widget_show);
}
- GNOME_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget));
+ GDL_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget));
}
static void
@@ -322,7 +321,7 @@
(GtkCallback) gdl_dock_object_foreach_automatic,
gtk_widget_hide);
}
- GNOME_CALL_PARENT (GTK_WIDGET_CLASS, hide, (widget));
+ GDL_CALL_PARENT (GTK_WIDGET_CLASS, hide, (widget));
}
static void
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-paned.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-paned.c 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-paned.c 2004-02-05 21:16:11 UTC (rev 793)
@@ -30,7 +30,6 @@
#include <string.h>
#include <gtk/gtkhpaned.h>
#include <gtk/gtkvpaned.h>
-#include <libgnome/gnome-macros.h>
#include "gdl-tools.h"
#include "gdl-dock-paned.h"
@@ -91,7 +90,7 @@
/* ----- Private functions ----- */
-GNOME_CLASS_BOILERPLATE (GdlDockPaned, gdl_dock_paned, GdlDockItem, GDL_TYPE_DOCK_ITEM);
+GDL_CLASS_BOILERPLATE (GdlDockPaned, gdl_dock_paned, GdlDockItem, GDL_TYPE_DOCK_ITEM);
static void
gdl_dock_paned_class_init (GdlDockPanedClass *klass)
@@ -225,7 +224,7 @@
{
GObject *g_object;
- g_object = GNOME_CALL_PARENT_WITH_DEFAULT (G_OBJECT_CLASS,
+ g_object = GDL_CALL_PARENT_WITH_DEFAULT (G_OBJECT_CLASS,
constructor,
(type,
n_construct_properties,
@@ -293,7 +292,7 @@
/* we need to call the virtual first, since in GdlDockDestroy our
children dock objects are detached */
- GNOME_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+ GDL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
/* after that we can remove the GtkNotebook */
if (item->child) {
@@ -346,7 +345,7 @@
if (include_internals) {
/* use GdlDockItem's forall */
- GNOME_CALL_PARENT (GTK_CONTAINER_CLASS, forall,
+ GDL_CALL_PARENT (GTK_CONTAINER_CLASS, forall,
(container, include_internals, callback, callback_data));
}
else {
@@ -569,7 +568,7 @@
if (!done) {
/* this will create another paned and reparent us there */
- GNOME_CALL_PARENT (GDL_DOCK_OBJECT_CLASS, dock, (object, requestor, position,
+ GDL_CALL_PARENT (GDL_DOCK_OBJECT_CLASS, dock, (object, requestor, position,
other_data));
}
else {
@@ -615,7 +614,7 @@
}
}
- GNOME_CALL_PARENT (GDL_DOCK_ITEM_CLASS, set_orientation, (item, orientation));
+ GDL_CALL_PARENT (GDL_DOCK_ITEM_CLASS, set_orientation, (item, orientation));
}
static gboolean
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-placeholder.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-placeholder.c 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-placeholder.c 2004-02-05 21:16:11 UTC (rev 793)
@@ -27,8 +27,7 @@
#endif
#include "gdl-i18n.h"
-#include <libgnome/gnome-macros.h>
-
+#include "gdl-dock-master.h"
#include "gdl-tools.h"
#include "gdl-dock-placeholder.h"
#include "gdl-dock-item.h"
@@ -103,8 +102,8 @@
/* ----- Private interface ----- */
-GNOME_CLASS_BOILERPLATE (GdlDockPlaceholder, gdl_dock_placeholder,
- GdlDockObject, GDL_TYPE_DOCK_OBJECT);
+GDL_CLASS_BOILERPLATE (GdlDockPlaceholder, gdl_dock_placeholder,
+ GdlDockObject, GDL_TYPE_DOCK_OBJECT);
static void
gdl_dock_placeholder_class_init (GdlDockPlaceholderClass *klass)
@@ -241,7 +240,7 @@
ph->_priv = NULL;
}
- GNOME_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+ GDL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
static void
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-tablabel.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-tablabel.c 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-tablabel.c 2004-02-05 21:16:11 UTC (rev 793)
@@ -27,7 +27,6 @@
#endif
#include "gdl-i18n.h"
-#include <libgnome/gnome-macros.h>
#include <gtk/gtk.h>
#include "gdl-dock-tablabel.h"
@@ -95,8 +94,7 @@
/* ----- Private interface ----- */
-GNOME_CLASS_BOILERPLATE (GdlDockTablabel, gdl_dock_tablabel,
- GtkBin, GTK_TYPE_BIN);
+GDL_CLASS_BOILERPLATE (GdlDockTablabel, gdl_dock_tablabel, GtkBin, GTK_TYPE_BIN);
static void
gdl_dock_tablabel_class_init (GdlDockTablabelClass *klass)
@@ -389,7 +387,7 @@
g_return_val_if_fail (event != NULL, FALSE);
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget)) {
- GNOME_CALL_PARENT (GTK_WIDGET_CLASS, expose_event, (widget, event));
+ GDL_CALL_PARENT (GTK_WIDGET_CLASS, expose_event, (widget, event));
gdl_dock_tablabel_paint (widget, event);
};
@@ -566,7 +564,7 @@
tablabel->event_window = NULL;
}
- GNOME_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget));
+ GDL_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget));
}
static void
@@ -574,7 +572,7 @@
{
GdlDockTablabel *tablabel = GDL_DOCK_TABLABEL (widget);
- GNOME_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget));
+ GDL_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget));
gdk_window_show (tablabel->event_window);
}
@@ -586,7 +584,7 @@
gdk_window_hide (tablabel->event_window);
- GNOME_CALL_PARENT (GTK_WIDGET_CLASS, unmap, (widget));
+ GDL_CALL_PARENT (GTK_WIDGET_CLASS, unmap, (widget));
}
/* ----- Public interface ----- */
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock.c 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock.c 2004-02-05 21:16:11 UTC (rev 793)
@@ -28,7 +28,6 @@
#include <stdlib.h>
#include <string.h>
#include <gdk/gdkx.h>
-#include <libgnome/gnome-macros.h>
#include "gdl-tools.h"
#include "gdl-dock.h"
@@ -149,7 +148,7 @@
/* ----- Private functions ----- */
-GNOME_CLASS_BOILERPLATE (GdlDock, gdl_dock, GdlDockObject, GDL_TYPE_DOCK_OBJECT);
+GDL_CLASS_BOILERPLATE (GdlDock, gdl_dock, GdlDockObject, GDL_TYPE_DOCK_OBJECT);
static void
gdl_dock_class_init (GdlDockClass *klass)
@@ -295,7 +294,7 @@
{
GObject *g_object;
- g_object = GNOME_CALL_PARENT_WITH_DEFAULT (G_OBJECT_CLASS,
+ g_object = GDL_CALL_PARENT_WITH_DEFAULT (G_OBJECT_CLASS,
constructor,
(type,
n_construct_properties,
@@ -537,7 +536,7 @@
g_free (priv);
}
- GNOME_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+ GDL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
static void
@@ -607,7 +606,7 @@
dock = GDL_DOCK (widget);
- GNOME_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget));
+ GDL_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget));
if (dock->root) {
child = GTK_WIDGET (dock->root);
@@ -627,7 +626,7 @@
dock = GDL_DOCK (widget);
- GNOME_CALL_PARENT (GTK_WIDGET_CLASS, unmap, (widget));
+ GDL_CALL_PARENT (GTK_WIDGET_CLASS, unmap, (widget));
if (dock->root) {
child = GTK_WIDGET (dock->root);
@@ -657,7 +656,7 @@
g_return_if_fail (widget != NULL);
g_return_if_fail (GDL_IS_DOCK (widget));
- GNOME_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget));
+ GDL_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget));
dock = GDL_DOCK (widget);
if (dock->_priv->floating && dock->_priv->window)
@@ -678,7 +677,7 @@
g_return_if_fail (widget != NULL);
g_return_if_fail (GDL_IS_DOCK (widget));
- GNOME_CALL_PARENT (GTK_WIDGET_CLASS, hide, (widget));
+ GDL_CALL_PARENT (GTK_WIDGET_CLASS, hide, (widget));
dock = GDL_DOCK (widget);
if (dock->_priv->floating && dock->_priv->window)
Added: trunk/MonoDevelop/gdldock/sources/gdl/gdl-i18n.h
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-i18n.h 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-i18n.h 2004-02-05 21:16:11 UTC (rev 793)
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+ * All rights reserved.
+ *
+ * This file is part of the Gnome Devtools Library.
+ *
+ * The Gnome Devtools Library is free software; you can redistribute
+ * it and/or modify it under the terms of the GNU Library General
+ * Public License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * The Gnome Devtools Library is distributed in the hope that it will
+ * be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+/*
+ @NOTATION@
+ */
+
+/*
+ * Handles all of the internationalization configuration options.
+ * Author: Tom Tromey <tromey at creche.cygnus.com>
+ */
+
+#ifndef __GDL_18N_H__
+#define __GDL_18N_H__ 1
+
+#include <glib.h>
+
+#define GETTEXT_PACKAGE ""
+#undef ENABLE_NLS
+
+G_BEGIN_DECLS
+
+#ifdef ENABLE_NLS
+# include <libintl.h>
+# undef _
+# define _(String) gdl_gettext (String)
+# ifdef gettext_noop
+# define N_(String) gettext_noop (String)
+# else
+# define N_(String) (String)
+# endif
+#else
+/* Stubs that do something close enough. */
+# undef textdomain
+# define textdomain(String) (String)
+# undef gettext
+# define gettext(String) (String)
+# undef dgettext
+# define dgettext(Domain,Message) (Message)
+# undef dcgettext
+# define dcgettext(Domain,Message,Type) (Message)
+# undef bindtextdomain
+# define bindtextdomain(Domain,Directory) (Domain)
+# undef bind_textdomain_codeset
+# define bind_textdomain_codeset(Domain,CodeSet) (Domain)
+# undef _
+# define _(String) (String)
+# undef N_
+# define N_(String) (String)
+#endif
+
+char *gdl_gettext (const char *msgid);
+
+G_END_DECLS
+
+#endif /* __GDL_I18N_H__ */
Added: trunk/MonoDevelop/gdldock/sources/gdl/gdl-tools.h
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-tools.h 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-tools.h 2004-02-05 21:16:11 UTC (rev 793)
@@ -0,0 +1,157 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * This file is part of the GNOME Devtool Libraries
+ *
+ * Copyright (C) 1999-2000 Dave Camp <dave at helixcode.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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* Miscellaneous GDL tools/macros */
+
+#ifndef __GDL_TOOLS_H__
+#define __GDL_TOOLS_H__
+
+#include <glib.h>
+
+/* FIXME: Toggle this */
+
+G_BEGIN_DECLS
+
+#define DO_GDL_TRACE
+
+#ifdef DO_GDL_TRACE
+
+#ifdef __GNUC__
+
+#define GDL_TRACE() G_STMT_START { \
+ g_log (G_LOG_DOMAIN, \
+ G_LOG_LEVEL_DEBUG, \
+ "file %s: line %d (%s)", \
+ __FILE__, \
+ __LINE__, \
+ __PRETTY_FUNCTION__); } G_STMT_END
+
+#define GDL_TRACE_EXTRA(format, args...) G_STMT_START { \
+ g_log (G_LOG_DOMAIN, \
+ G_LOG_LEVEL_DEBUG, \
+ "file %s: line %d (%s): "format, \
+ __FILE__, \
+ __LINE__, \
+ __PRETTY_FUNCTION__, \
+ ##args); } G_STMT_END
+
+#else /* __GNUC__ */
+
+#define GDL_TRACE() G_STMT_START { \
+ g_log (G_LOG_DOMAIN, \
+ G_LOG_LEVEL_DEBUG, \
+ "file %s: line %d", \
+ __FILE__, \
+ __LINE__); } G_STMT_END
+
+#define GDL_TRACE_EXTRA(format, args...) G_STMT_START { \
+ g_log (G_LOG_DOMAIN, \
+ G_LOG_LEVEL_DEBUG, \
+ "file %s: line %d: "format, \
+ __FILE__, \
+ __LINE__, \
+ ##args); } G_STMT_END
+#endif /* __GNUC__ */
+
+#else /* DO_GDL_TRACE */
+
+#define GDL_TRACE()
+#define GDL_TRACE_EXTRA()
+
+#endif /* DO_GDL_TRACE */
+
+/* Macros for defining classes. Ideas taken from Nautilus and GOB. */
+
+#define GDL_BOILERPLATE(type, type_as_function, corba_type, \
+ parent_type, parent_type_macro, \
+ register_type_macro) \
+static void type_as_function ## _class_init (type ## Class *klass); \
+static void type_as_function ## _instance_init (type *object); \
+static parent_type ## Class *parent_class = NULL; \
+static void \
+type_as_function ## _class_init_trampoline (gpointer klass, \
+ gpointer data) \
+{ \
+ parent_class = (parent_type ## Class *)g_type_class_ref ( \
+ parent_type_macro); \
+ type_as_function ## _class_init ((type ## Class *)klass); \
+} \
+GType \
+type_as_function ## _get_type (void) \
+{ \
+ static GType object_type = 0; \
+ if (object_type == 0) { \
+ static const GTypeInfo object_info = { \
+ sizeof (type ## Class), \
+ NULL, /* base_init */ \
+ NULL, /* base_finalize */ \
+ type_as_function ## _class_init_trampoline, \
+ NULL, /* class_finalize */ \
+ NULL, /* class_data */ \
+ sizeof (type), \
+ 0, /* n_preallocs */ \
+ (GInstanceInitFunc) type_as_function ## _instance_init \
+ }; \
+ object_type = register_type_macro \
+ (type, type_as_function, corba_type, \
+ parent_type, parent_type_macro); \
+ } \
+ return object_type; \
+}
+
+
+/* Define the boilerplate type stuff to reduce typos and code size. Defines
+ * the get_type method and the parent_class static variable. */
+#define GDL_CLASS_BOILERPLATE(type, type_as_function, \
+ parent_type, parent_type_macro) \
+ GDL_BOILERPLATE(type, type_as_function, type, \
+ parent_type, parent_type_macro, \
+ GDL_REGISTER_TYPE)
+#define GDL_REGISTER_TYPE(type, type_as_function, corba_type, \
+ parent_type, parent_type_macro) \
+ g_type_register_static (parent_type_macro, #type, &object_info, 0)
+
+
+
+#define GDL_CALL_VIRTUAL(object, get_class_cast, method, args) \
+ (get_class_cast (object)->method ? (* get_class_cast (object)->method) args : (void)0)
+#define GDL_CALL_VIRTUAL_WITH_DEFAULT(object, get_class_cast, method, args, default) \
+ (get_class_cast (object)->method ? (* get_class_cast (object)->method) args : default)
+
+/* Just call the parent handler. This assumes that there is a variable
+ * named parent_class that points to the (duh!) parent class. Note that
+ * this macro is not to be used with things that return something, use
+ * the _WITH_DEFAULT version for that */
+#define GDL_CALL_PARENT(parent_class_cast, name, args) \
+ ((parent_class_cast(parent_class)->name != NULL) ? \
+ parent_class_cast(parent_class)->name args : (void)0)
+
+/* Same as above, but in case there is no implementation, it evaluates
+ * to def_return */
+#define GDL_CALL_PARENT_WITH_DEFAULT(parent_class_cast, \
+ name, args, def_return) \
+ ((parent_class_cast(parent_class)->name != NULL) ? \
+ parent_class_cast(parent_class)->name args : def_return)
+
+G_END_DECLS
+
+#endif
Added: trunk/MonoDevelop/gdldock/sources/gdl/layout.glade
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/layout.glade 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/layout.glade 2004-02-05 21:16:11 UTC (rev 793)
@@ -0,0 +1,283 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+<requires lib="gnome"/>
+
+<widget class="GtkDialog" id="layout_dialog">
+ <property name="border_width">4</property>
+ <property name="title" translatable="yes">Layout Managment</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">True</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="has_separator">True</property>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</property>
+
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkNotebook" id="layout_container">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="show_tabs">True</property>
+ <property name="show_border">True</property>
+ <property name="tab_pos">GTK_POS_TOP</property>
+ <property name="scrollable">False</property>
+ <property name="enable_popup">False</property>
+
+ <child>
+ <widget class="GtkVBox" id="items_vbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow3">
+ <property name="height_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="items_list">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">True</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="locked_check">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Lock dock items</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="tab_expand">False</property>
+ <property name="tab_fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Dock items</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="layouts_vbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow4">
+ <property name="height_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="layouts_list">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">False</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkButton" id="delete_button">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-delete</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <signal name="clicked" handler="on_delete_button_clicked" last_modification_time="Thu, 29 May 2003 18:32:55 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="load_button">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <signal name="clicked" handler="on_load_button_clicked" last_modification_time="Fri, 30 May 2003 11:34:24 GMT"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-open</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Load</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="tab_expand">False</property>
+ <property name="tab_fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Saved layouts</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+</glade-interface>
Added: trunk/MonoDevelop/gdldock/sources/gdl/libgdlmarshal.list
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/libgdlmarshal.list 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl/libgdlmarshal.list 2004-02-05 21:16:11 UTC (rev 793)
@@ -0,0 +1,6 @@
+VOID:VOID
+VOID:INT,INT
+VOID:UINT,UINT
+VOID:BOOLEAN
+VOID:OBJECT,ENUM,BOXED
+VOID:BOXED
Modified: trunk/MonoDevelop/gdldock/sources/gdl-sharp-sources.xml
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl-sharp-sources.xml 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/gdldock/sources/gdl-sharp-sources.xml 2004-02-05 21:16:11 UTC (rev 793)
@@ -1,6 +1,6 @@
<gapi-parser-input>
<api filename="../gdl/gdl-api.xml">
- <library name="gdl-1">
+ <library name="gdldock">
<namespace name="Gdl">
<dir>gdl</dir>
</namespace>
Modified: trunk/MonoDevelop/monodevelop
===================================================================
--- trunk/MonoDevelop/monodevelop 2004-02-05 21:03:12 UTC (rev 792)
+++ trunk/MonoDevelop/monodevelop 2004-02-05 21:16:11 UTC (rev 793)
@@ -19,7 +19,9 @@
exit 1
fi
-LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+GDLDOCKPATH=$(pwd)/build/bin
+
+LD_LIBRARY_PATH=$MOZILLA_HOME:$GDLDOCK_PATH:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
MOZILLA_FIVE_HOME=$MOZILLA_HOME
More information about the Monodevelop-patches-list
mailing list