[Monodevelop-patches-list] r613 - in trunk/MonoDevelop: . gtkmozembed-sharp src/AddIns/Misc/StartPage src/Main/Base

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Thu Jan 22 00:20:02 EST 2004


Author: jluke
Date: 2004-01-22 00:20:02 -0500 (Thu, 22 Jan 2004)
New Revision: 613

Added:
   trunk/MonoDevelop/gtkmozembed-sharp/EmbedWidget.custom
   trunk/MonoDevelop/gtkmozembed-sharp/GtkMozEmbed.metadata
   trunk/MonoDevelop/gtkmozembed-sharp/Makefile
   trunk/MonoDevelop/gtkmozembed-sharp/NewWindowOrphan_handler.cs
   trunk/MonoDevelop/gtkmozembed-sharp/NewWindow_delegate.cs
   trunk/MonoDevelop/gtkmozembed-sharp/NewWindow_handler.cs
   trunk/MonoDevelop/gtkmozembed-sharp/Single.custom
   trunk/MonoDevelop/gtkmozembed-sharp/gtkmozembed-api.xml
Removed:
   trunk/MonoDevelop/gtkmozembed-sharp/AUTHORS
   trunk/MonoDevelop/gtkmozembed-sharp/ChangeLog
   trunk/MonoDevelop/gtkmozembed-sharp/Makefile.am
   trunk/MonoDevelop/gtkmozembed-sharp/NEWS
   trunk/MonoDevelop/gtkmozembed-sharp/README
   trunk/MonoDevelop/gtkmozembed-sharp/autogen.sh
   trunk/MonoDevelop/gtkmozembed-sharp/configure.in
   trunk/MonoDevelop/gtkmozembed-sharp/gtkmozembed/
Modified:
   trunk/MonoDevelop/Makefile
   trunk/MonoDevelop/README
   trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile
   trunk/MonoDevelop/src/Main/Base/Makefile
Log:
use plain make for gtkmozembed-sharp
and build it to build/bin/
see README for insctructions
(make clean && make PREFIX=/usr && ./monodevelop)


Modified: trunk/MonoDevelop/Makefile
===================================================================
--- trunk/MonoDevelop/Makefile	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/Makefile	2004-01-22 05:20:02 UTC (rev 613)
@@ -1,10 +1,16 @@
 PROGRAM=build/bin/SharpDevelop.exe
 MONOPAD=build/bin/MonoPad.exe
+GTKMOZEMBED=build/bin/gtkmozembed-sharp.dll
 QMAKE=@ $(MAKE)
-$(PROGRAM): SharpDevelop.Base SharpDevelop.DefaultTexteditor CSharpBinding StartPage
+
+$(PROGRAM): $(GTKMOZEMBED) SharpDevelop.Base SharpDevelop.DefaultTexteditor CSharpBinding StartPage
 	@ echo Building $@
 	$(QMAKE) -C src/Main/StartUp
 
+$(GTKMOZEMBED):
+	@ echo Building $@
+	$(QMAKE) -C gtkmozembed-sharp
+
 $(MONOPAD): ICSharpCode.TextEditor
 	@ echo Building $@
 	$(QMAKE) -C samples/MonoPad

Modified: trunk/MonoDevelop/README
===================================================================
--- trunk/MonoDevelop/README	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/README	2004-01-22 05:20:02 UTC (rev 613)
@@ -1,15 +1,20 @@
 This is a port of SharpDevelop to Gtk# and Mono.
-To compile simply run make, or 'make run' to compile and run it.
-You need Mono and Gtk# cvs, and ORBit2-2.8.3 or newer
 
-You will also need GtkMozEmbed# installed.  If you do not have a recent version. Do this once:
-cd ./gtkmozembed-sharp && ./autogen.sh --prefix=/usr/local && make && make install
+To compile run the following command:
+make PREFIX=/usr/local
 
-(replace /usr/local with the same prefix as the rest of Gtk#)
+(change /usr/local to the prefix Gtk# is installed to)
 
+To run MonoDevelop:
+./monodevelop
+
+EXAMPLE:
+make clean && make PREFIX=/usr && ./monodevelop
+
+You need Mono and Gtk# cvs, and ORBit2-2.8.3 or newer
+
 Mono must be installed with ICU enabled.
 
-
 We are attempting to follow the HIG in certain areas especially, particularly dialogs.
 
 You can find a copy of the HIG at http://developer.gnome.org/projects/gup/hig/1.0/

Deleted: trunk/MonoDevelop/gtkmozembed-sharp/AUTHORS
===================================================================

Deleted: trunk/MonoDevelop/gtkmozembed-sharp/ChangeLog
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/ChangeLog	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/gtkmozembed-sharp/ChangeLog	2004-01-22 05:20:02 UTC (rev 613)
@@ -1,15 +0,0 @@
-2003-11-23  John Luke  <jluke at cfl.rr.com>
-
-	* Makefile.am: remove sources from SUBDIRS
-	* autogen.sh: run configure by default
-	* configure.in: no need to output api/Makefile
-	* api/*: no longer used
-	* gtkmozembed/Single.custom: comment out signals temporarily
-	* gtkmozembed/GtkMozEmbed.metadata: add here, and port to XPath style
-	* gtkmozembed/Makefile.am: update to use gapi-fixup
-		and generate the sources
-	* sources/GtkMozEmbed.metadata: remove
-	* sources/Makefile.am: run gapi-parser unconditionally
-	* sources/gtkmozembed-sharp-sources.xml: add sources file
-	* sources/gtkmozembed-sharp.sources: remove
-	

Added: trunk/MonoDevelop/gtkmozembed-sharp/EmbedWidget.custom
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/EmbedWidget.custom	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/gtkmozembed-sharp/EmbedWidget.custom	2004-01-22 05:20:02 UTC (rev 613)
@@ -0,0 +1,36 @@
+		[GLib.Signal("new_window")]
+                public event GtkMozEmbedSharp.NewWindowHandler NewWindow {
+                        add {
+                                if (EventList["new_window"] == null)
+                                        Signals["new_window"] = new GtkMozEmbedSharp.voidObjectObjectuintSignal(this, Handle, "new_window", value, System.Type.GetType("GtkMozEmbedSharp.NewWindowArgs,gtkmozembed-sharp"));
+                                else
+                                        ((GtkSharp.SignalCallback) Signals ["new_window"]).AddDelegate (value);
+                                EventList.AddHandler("new_window", value);
+                        }
+                        remove {
+                                EventList.RemoveHandler("new_window", value);
+                                GtkSharp.SignalCallback cb = Signals ["new_window"] as GtkSharp.SignalCallback;
+                                if (cb == null)
+                                        return;
+                                                                                
+                                cb.RemoveDelegate (value);
+                                                                                
+                                if (EventList["new_window"] == null) {
+                                        Signals.Remove("new_window");
+                                        cb.Dispose ();
+                                }
+                        }
+                }
+[DllImport("gtkembedmoz")]
+static extern IntPtr gtk_moz_embed_new();
+
+public EmbedWidget(string aPath, string aDir)
+{
+	gtk_moz_embed_set_profile_path(aPath, aDir);
+	Raw = gtk_moz_embed_new ();
+}
+
+public EmbedWidget()
+{
+	Raw = gtk_moz_embed_new();
+}

Added: trunk/MonoDevelop/gtkmozembed-sharp/GtkMozEmbed.metadata
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/GtkMozEmbed.metadata	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/gtkmozembed-sharp/GtkMozEmbed.metadata	2004-01-22 05:20:02 UTC (rev 613)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<metadata>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']" name="name">EmbedWidget</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']" name="disabledefaultconstructor">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/constructor[@cname='gtk_moz_embed_new']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='ReloadFlagsGetType']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='ProgressFlagsGetType']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='StatusEnumsGetType']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='ChromeFlagsGetType']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='GetTitle']" name="name">GetGeckoTitle</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='GetLocation']" name="name">GetGeckoLocation</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='GetJsStatus']" name="name">GetGeckoJsStatus</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='GetLinkMessage']" name="name">GetGeckoLinkMessage</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/signal[@cname='new_window']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbedSingle']/signal[@cname='new_window_orphan']" name="hidden">1</attr>
+</metadata>

Added: trunk/MonoDevelop/gtkmozembed-sharp/Makefile
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/Makefile	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/gtkmozembed-sharp/Makefile	2004-01-22 05:20:02 UTC (rev 613)
@@ -0,0 +1,23 @@
+MCS=mcs
+ASSEMBLY = ../build/bin/gtkmozembed-sharp.dll
+
+INCLUDE_APIS = \
+	$(PREFIX)/share/gapi/gdk-api.xml \
+	$(PREFIX)/share/gapi/gtk-api.xml \
+	$(PREFIX)/share/gapi/atk-api.xml
+			
+all: generated-stamp $(ASSEMBLY)
+
+generated-stamp: gtkmozembed-api.xml
+	gapi-fixup --api=gtkmozembed-api.xml --metadata=GtkMozEmbed.metadata && \
+	 	gapi-codegen --generate gtkmozembed-api.xml --include $(INCLUDE_APIS) --outdir=generated --customdir=. --assembly-name=gtkmozembed-sharp && touch generated-stamp
+
+$(ASSEMBLY): generated-stamp
+	$(MCS) --unsafe --target library -L @prefix@/lib \
+	-r glib-sharp.dll -r gtk-sharp.dll -r gdk-sharp.dll \
+	--recurse '*.cs' -o $(ASSEMBLY)
+ 
+clean:
+	rm -f generated-stamp
+	rm -rf generated
+ 

Deleted: trunk/MonoDevelop/gtkmozembed-sharp/Makefile.am
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/Makefile.am	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/gtkmozembed-sharp/Makefile.am	2004-01-22 05:20:02 UTC (rev 613)
@@ -1 +0,0 @@
-SUBDIRS = gtkmozembed

Deleted: trunk/MonoDevelop/gtkmozembed-sharp/NEWS
===================================================================

Added: trunk/MonoDevelop/gtkmozembed-sharp/NewWindowOrphan_handler.cs
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/NewWindowOrphan_handler.cs	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/gtkmozembed-sharp/NewWindowOrphan_handler.cs	2004-01-22 05:20:02 UTC (rev 613)
@@ -0,0 +1,24 @@
+// This file was generated by the Gtk# Code generator.
+// Any changes made will be lost if regenerated.
+
+namespace GtkMozEmbedSharp {
+
+	using System;
+
+	public delegate void NewWindowOrphanHandler(object o, NewWindowArgs args);
+
+	public class NewWindowOrphanArgs : GtkSharp.SignalArgs {
+		public GtkMozEmbed.EmbedWidget NewEmbed{
+			set {
+				Args[0] = (GtkMozEmbed.EmbedWidget) value;
+			}
+		}
+
+		public uint Chromemask{
+			get {
+				return (uint) Args[1];
+			}
+		}
+
+	}
+}

Added: trunk/MonoDevelop/gtkmozembed-sharp/NewWindow_delegate.cs
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/NewWindow_delegate.cs	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/gtkmozembed-sharp/NewWindow_delegate.cs	2004-01-22 05:20:02 UTC (rev 613)
@@ -0,0 +1,65 @@
+// Generated File.  Do not modify.
+// <c> 2001-2002 Mike Kestner
+
+namespace GtkMozEmbedSharp {
+
+	using System;
+	using System.Runtime.InteropServices;
+	using GtkSharp;
+
+	internal delegate void voidObjectObjectuintDelegate(IntPtr arg0, out IntPtr arg1, uint arg2, int key);
+
+	internal class voidObjectObjectuintSignal : SignalCallback {
+
+		private static voidObjectObjectuintDelegate _Delegate;
+
+		private IntPtr _raw;
+		private uint _HandlerID;
+
+		private static void voidObjectObjectuintCallback(IntPtr arg0, out IntPtr arg1, uint arg2, int key)
+		{
+			if (!_Instances.Contains(key))
+				throw new Exception("Unexpected signal key " + key);
+
+			voidObjectObjectuintSignal inst = (voidObjectObjectuintSignal) _Instances[key];
+			SignalArgs args = (SignalArgs) Activator.CreateInstance (inst._argstype);
+			args.Args = new object[2];
+
+			// Ok, arg1 is set by the handler...
+			// So, we can pass a null, and we'll get an Gtk.Object back
+			args.Args[0] = null;
+			args.Args[1] = arg2;
+
+			object[] argv = new object[2];
+			argv[0] = inst._obj;
+			argv[1] = args;
+			inst._handler.DynamicInvoke(argv);
+			arg1 = ((GLib.Object)args.Args[0]).Handle;				
+		}
+
+		[DllImport("libgobject-2.0-0.dll")]
+		static extern uint g_signal_connect_data(IntPtr obj, String name, voidObjectObjectuintDelegate cb, int key, IntPtr p, int flags);
+
+		public voidObjectObjectuintSignal(GLib.Object obj, IntPtr raw, String name, Delegate eh, Type argstype) : base(obj, eh, argstype)
+		{
+			if (_Delegate == null) {
+				_Delegate = new voidObjectObjectuintDelegate(voidObjectObjectuintCallback);
+			}
+			_raw = raw;
+			_HandlerID = g_signal_connect_data(raw, name, _Delegate, _key, new IntPtr(0), 0);
+		}
+
+		[DllImport("libgobject-2.0-0.dll")]
+		static extern void g_signal_handler_disconnect (IntPtr instance, uint handler);
+
+		protected override void Dispose (bool disposing)
+		{
+			_Instances.Remove(_key);
+			if(_Instances.Count == 0)
+				_Delegate = null;
+
+			g_signal_handler_disconnect (_raw, _HandlerID);
+			base.Dispose (disposing);
+		}
+	}
+}

Added: trunk/MonoDevelop/gtkmozembed-sharp/NewWindow_handler.cs
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/NewWindow_handler.cs	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/gtkmozembed-sharp/NewWindow_handler.cs	2004-01-22 05:20:02 UTC (rev 613)
@@ -0,0 +1,24 @@
+// This file was generated by the Gtk# Code generator.
+// Any changes made will be lost if regenerated.
+
+namespace GtkMozEmbedSharp {
+
+	using System;
+
+	public delegate void NewWindowHandler(object o, NewWindowArgs args);
+
+	public class NewWindowArgs : GtkSharp.SignalArgs {
+		public GtkMozEmbed.EmbedWidget NewEmbed{
+			set {
+				Args[0] = (GtkMozEmbed.EmbedWidget) value;
+			}
+		}
+
+		public uint Chromemask{
+			get {
+				return (uint) Args[1];
+			}
+		}
+
+	}
+}

Deleted: trunk/MonoDevelop/gtkmozembed-sharp/README
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/README	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/gtkmozembed-sharp/README	2004-01-22 05:20:02 UTC (rev 613)
@@ -1,16 +0,0 @@
-This is gtkmozembed-sharp.  To use it, you need two things:
-
-1) A working mozilla build.
-   Note, the build *must* use gtk2.  You can do this by adding:
-   ac_add_options --enable-default-toolkit=gtk2
-   to your .mozconfig file.
-
-   Also note, this needs gtk2.  The Win32 version of mozilla doesn't
-   even touch gtk.  Therefore, this will *not* work on Win32.  It might,
-   however.  Someone enterprising needs to try it.
-
-2) The CVS release of gtk-sharp.  There was a bug in the generator
-   which is now fixed.  gtk-sharp also needs to be installed.
-
-There is a small test app included.  It should be enough to get
-one started.  Note, this is just gtkmozembed, not an XPCOM binding.

Added: trunk/MonoDevelop/gtkmozembed-sharp/Single.custom
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/Single.custom	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/gtkmozembed-sharp/Single.custom	2004-01-22 05:20:02 UTC (rev 613)
@@ -0,0 +1,25 @@
+/*
+	[GLib.Signal("new_window_orphan")]
+		public event GtkMozEmbedSharp.NewWindowOrphanHandler NewWindowOrphan {
+			add {
+				if (EventList["new_window_orphan"] == null)
+					Signals["new_window_orphan"] = new GtkMozEmbedSharp.voidObjectObjectuintSignal(this, Handle, "new_window_orphan", value, System.Type.GetType("GtkMozEmbedSharp.NewWindowOrphanArgs,gtkmozembed-sharp"));
+				else
+					((GtkSharp.SignalCallback) Signals ["new_window_orphan"]).AddDelegate (value);
+				EventList.AddHandler("new_window_orphan", value);
+			}
+			remove {
+				EventList.RemoveHandler("new_window_orphan", value);
+				GtkSharp.SignalCallback cb = Signals ["new_window_orphan"] as GtkSharp.SignalCallback;
+				if (cb == null)
+					return;
+
+				cb.RemoveDelegate (value);
+
+				if (EventList["new_window_orphan"] == null) {
+					Signals.Remove("new_window_orphan");
+					cb.Dispose ();
+				}
+			}
+		}
+*/

Deleted: trunk/MonoDevelop/gtkmozembed-sharp/autogen.sh
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/autogen.sh	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/gtkmozembed-sharp/autogen.sh	2004-01-22 05:20:02 UTC (rev 613)
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-# Ok, simple script to do this.
-
-aclocal
-automake --add-missing --gnu
-autoconf
-
-./configure $@

Deleted: trunk/MonoDevelop/gtkmozembed-sharp/configure.in
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/configure.in	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/gtkmozembed-sharp/configure.in	2004-01-22 05:20:02 UTC (rev 613)
@@ -1,91 +0,0 @@
-AC_INIT(README)
-AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(gtkmozembed, 0.1)
-AM_MAINTAINER_MODE
-AM_PROG_LIBTOOL
-
-dnl AC_MSG_CHECKING([whether we're compiling from CVS])
-dnl if test -f "$srcdir/.cvs_version" ; then
-dnl 	from_cvs=yes
-dnl else
-dnl 	from_cvs=no
-dnl fi
-dnl AC_MSG_RESULT($from_cvs)
-
-dnl if test "x$from_cvs" = "xyes" ; then
-	dnl AC_PATH_PROG(GAPI_CODEGEN, gapi_codegen.exe, no)
-	dnl if test "x$GAPI_CODEGEN" != "xno"; then
-	dnl 	gtksharp_path=`dirname $GAPI_CODEGEN`
-	dnl 	GTKSHARP_PREFIX=`dirname $gtksharp_path`
-	dnl 	have_gtk=yes
-	dnl else
-		dnl AC_MSG_WARN([Cannot find gtk-sharp, the GUI won't be build])
-		dnl have_gtk=no
-	dnl 	GTKSHARP_PREFIX=PREFIX
-	dnl fi
-dnl else
-	dnl have_gtk=yes
-dnl fi
-dnl AC_SUBST(GTKSHARP_PREFIX)
-
-dnl AM_CONDITIONAL(USE_GAPI_CODEGEN, test x$from_cvs = xyes)
-
-AC_PATH_PROG(MONO, mono)
-AC_PATH_PROG(MCS, mcs)
-if test "x$MONO" = "x" ; then
-  AC_MSG_ERROR([Can't find "mono" in your PATH])
-fi
-if test "x$MCS" = "x" ; then
-  AC_MSG_ERROR([Can't find "mcs" in your PATH])
-fi
-AC_SUBST(PATH)
-AC_SUBST(LD_LIBRARY_PATH)
-
-dnl Find pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$PKG_CONFIG" = "xno"; then
-        AC_MSG_ERROR([You need to install pkg-config])
-fi
-
-dnl Find mono
-MONO_REQUIRED_VERSION=0.29
-
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, mono >= $MONO_REQUIRED_VERSION)
-
-dnl Find gtk-sharp
-GTKSHARP_REQUIRED_VERSION=0.15
-
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk-sharp >= $GTKSHARP_REQUIRED_VERSION) 
-
-dnl Find GTK
-dnl BUILD_GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
-dnl BUILD_GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
-dnl AC_SUBST(BUILD_GTK_CFLAGS)
-dnl AC_SUBST(BUILD_GTK_LIBS)
-
-dnl GTK_REQUIRED_VERSION=2.0.0
-
-dnl PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION) 
-
-dnl AC_SUBST(BASE_DEPENDENCIES_CFLAGS)
-dnl AC_SUBST(BASE_DEPENDENCIES_LIBS)
-
-dnl Find Mozilla
-dnl AC_ARG_WITH(mozilla-headers,
-dnl        [  --with-mozilla-headers  Specify location of MOZILLA headers],
-dnl        [MOZ_CFLAGS="-I$withval"],
-dnl        [MOZ_CFLAGS="-I/usr/include/mozilla"])
-                                                                                
-dnl AC_ARG_WITH(mozilla-libs,
-dnl        [  --with-mozilla-libs     Specify location of MOZILLA libs],
-dnl        [MOZ_LIBS="-L$withval"],
-dnl        [MOZ_LIBS="-L/usr/lib/mozilla"])
-
-dnl AC_SUBST(MOZ_LIBS)
-dnl AC_SUBST(MOZ_CFLAGS)
-
-
-AC_OUTPUT([
-Makefile
-gtkmozembed/Makefile
-])

Added: trunk/MonoDevelop/gtkmozembed-sharp/gtkmozembed-api.xml
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/gtkmozembed-api.xml	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/gtkmozembed-sharp/gtkmozembed-api.xml	2004-01-22 05:20:02 UTC (rev 613)
@@ -0,0 +1,362 @@
+<?xml version="1.0"?>
+<api><!--
+
+        This file was automatically generated.
+        Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
+
+-->
+  <namespace name="GtkMozEmbed" library="gtkembedmoz">
+    <enum name="ChromeFlags" cname="GtkMozEmbedChromeFlags" type="enum">
+      <member cname="GTK_MOZ_EMBED_FLAG_DEFAULTCHROME" name="Defaultchrome" value="1U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWBORDERSON" name="Windowborderson" value="2U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWCLOSEON" name="Windowcloseon" value="4U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWRESIZEON" name="Windowresizeon" value="8U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_MENUBARON" name="Menubaron" value="16U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_TOOLBARON" name="Toolbaron" value="32U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_LOCATIONBARON" name="Locationbaron" value="64U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_STATUSBARON" name="Statusbaron" value="128U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_PERSONALTOOLBARON" name="Personaltoolbaron" value="256U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_SCROLLBARSON" name="Scrollbarson" value="512U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_TITLEBARON" name="Titlebaron" value="1024U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_EXTRACHROMEON" name="Extrachromeon" value="2048U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_ALLCHROME" name="Allchrome" value="4094U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWRAISED" name="Windowraised" value="33554432U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWLOWERED" name="Windowlowered" value="67108864U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_CENTERSCREEN" name="Centerscreen" value="134217728U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_DEPENDENT" name="Dependent" value="268435456U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_MODAL" name="Modal" value="536870912U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_OPENASDIALOG" name="Openasdialog" value="1073741824U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_OPENASCHROME" name="Openaschrome" value="2147483648U " />
+    </enum>
+    <enum name="ProgressFlags" cname="GtkMozEmbedProgressFlags" type="enum">
+      <member cname="GTK_MOZ_EMBED_FLAG_START" name="Start" value="1" />
+      <member cname="GTK_MOZ_EMBED_FLAG_REDIRECTING" name="Redirecting" value="2" />
+      <member cname="GTK_MOZ_EMBED_FLAG_TRANSFERRING" name="Transferring" value="4" />
+      <member cname="GTK_MOZ_EMBED_FLAG_NEGOTIATING" name="Negotiating" value="8" />
+      <member cname="GTK_MOZ_EMBED_FLAG_STOP" name="Stop" value="16" />
+      <member cname="GTK_MOZ_EMBED_FLAG_IS_REQUEST" name="IsRequest" value="65536" />
+      <member cname="GTK_MOZ_EMBED_FLAG_IS_DOCUMENT" name="IsDocument" value="131072" />
+      <member cname="GTK_MOZ_EMBED_FLAG_IS_NETWORK" name="IsNetwork" value="262144" />
+      <member cname="GTK_MOZ_EMBED_FLAG_IS_WINDOW" name="IsWindow" value="524288 " />
+    </enum>
+    <enum name="ReloadFlags" cname="GtkMozEmbedReloadFlags" type="enum">
+      <member cname="GTK_MOZ_EMBED_FLAG_RELOADNORMAL" name="Reloadnormal" />
+      <member cname="GTK_MOZ_EMBED_FLAG_RELOADBYPASSCACHE" name="Reloadbypasscache" value="1" />
+      <member cname="GTK_MOZ_EMBED_FLAG_RELOADBYPASSPROXY" name="Reloadbypassproxy" value="2" />
+      <member cname="GTK_MOZ_EMBED_FLAG_RELOADBYPASSPROXYANDCACHE" name="Reloadbypassproxyandcache" value="3" />
+      <member cname="GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE" name="Reloadcharsetchange" value="4" />
+    </enum>
+    <enum name="StatusFlags" cname="GtkMozEmbedStatusFlags" type="enum">
+      <member cname="GTK_MOZ_EMBED_STATUS_FAILED_DNS" name="Dns" value="2152398878U" />
+      <member cname="GTK_MOZ_EMBED_STATUS_FAILED_CONNECT" name="Connect" value="2152398861U" />
+      <member cname="GTK_MOZ_EMBED_STATUS_FAILED_TIMEOUT" name="Timeout" value="2152398862U" />
+      <member cname="GTK_MOZ_EMBED_STATUS_FAILED_USERCANCELED" name="Usercanceled" value="2152398850U" />
+    </enum>
+    <object cname="GtkMozEmbed" parent="GtkBin" name="EmbedWidget" disabledefaultconstructor="1">
+      <field cname="data" type="void*" />
+      <signal name="LinkMessage" cname="link_message" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="JsStatus" cname="js_status" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="Location" cname="location" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="Title" cname="title" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="Progress" cname="progress" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gint" name="curprogress" />
+          <parameter type="gint" name="maxprogress" />
+        </parameters>
+      </signal>
+      <signal name="ProgressAll" cname="progress_all" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="const-char*" name="aURI" />
+          <parameter type="gint" name="curprogress" />
+          <parameter type="gint" name="maxprogress" />
+        </parameters>
+      </signal>
+      <signal name="NetState" cname="net_state" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gint" name="state" />
+          <parameter type="guint" name="status" />
+        </parameters>
+      </signal>
+      <signal name="NetStateAll" cname="net_state_all" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="const-char*" name="aURI" />
+          <parameter type="gint" name="state" />
+          <parameter type="guint" name="status" />
+        </parameters>
+      </signal>
+      <signal name="NetStart" cname="net_start" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="NetStop" cname="net_stop" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="NewWindow" cname="new_window" when="FIRST" hidden="1">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="GtkMozEmbed**" name="newEmbed" />
+          <parameter type="guint" name="chromemask" />
+        </parameters>
+      </signal>
+      <signal name="Visibility" cname="visibility" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gboolean" name="visibility" />
+        </parameters>
+      </signal>
+      <signal name="DestroyBrowser" cname="destroy_browser" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="OpenUri" cname="open_uri" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="const-char*" name="aURI" />
+        </parameters>
+      </signal>
+      <signal name="SizeTo" cname="size_to" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+        </parameters>
+      </signal>
+      <signal name="DomKeyDown" cname="dom_key_down" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomKeyPress" cname="dom_key_press" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomKeyUp" cname="dom_key_up" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomMouseDown" cname="dom_mouse_down" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomMouseUp" cname="dom_mouse_up" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomMouseClick" cname="dom_mouse_click" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomMouseDblClick" cname="dom_mouse_dbl_click" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomMouseOver" cname="dom_mouse_over" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomMouseOut" cname="dom_mouse_out" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="SecurityChange" cname="security_change" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="request" />
+          <parameter type="guint" name="state" />
+        </parameters>
+      </signal>
+      <signal name="StatusChange" cname="status_change" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="request" />
+          <parameter type="gint" name="status" />
+          <parameter type="gpointer" name="message" />
+        </parameters>
+      </signal>
+      <method name="AppendData" cname="gtk_moz_embed_append_data">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-char*" name="data" />
+          <parameter type="guint32" name="len" />
+        </parameters>
+      </method>
+      <method name="CanGoBack" cname="gtk_moz_embed_can_go_back">
+        <return-type type="gboolean" />
+      </method>
+      <method name="CanGoForward" cname="gtk_moz_embed_can_go_forward">
+        <return-type type="gboolean" />
+      </method>
+      <method name="CloseStream" cname="gtk_moz_embed_close_stream">
+        <return-type type="void" />
+      </method>
+      <method name="GetChromeMask" cname="gtk_moz_embed_get_chrome_mask">
+        <return-type type="guint32" />
+      </method>
+      <method cname="gtk_moz_embed_get_js_status" name="GetGeckoJsStatus">
+        <return-type type="char*" />
+      </method>
+      <method cname="gtk_moz_embed_get_link_message" name="GetGeckoLinkMessage">
+        <return-type type="char*" />
+      </method>
+      <method cname="gtk_moz_embed_get_location" name="GetGeckoLocation">
+        <return-type type="char*" />
+      </method>
+      <method cname="gtk_moz_embed_get_title" name="GetGeckoTitle">
+        <return-type type="char*" />
+      </method>
+      <method name="GetType" cname="gtk_moz_embed_get_type" shared="true">
+        <return-type type="GtkType" />
+      </method>
+      <method name="GoBack" cname="gtk_moz_embed_go_back">
+        <return-type type="void" />
+      </method>
+      <method name="GoForward" cname="gtk_moz_embed_go_forward">
+        <return-type type="void" />
+      </method>
+      <method name="LoadUrl" cname="gtk_moz_embed_load_url">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-char*" name="url" />
+        </parameters>
+      </method>
+      <constructor cname="gtk_moz_embed_new" hidden="1" />
+      <method name="OpenStream" cname="gtk_moz_embed_open_stream">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-char*" name="base_uri" />
+          <parameter type="const-char*" name="mime_type" />
+        </parameters>
+      </method>
+      <method name="PopStartup" cname="gtk_moz_embed_pop_startup" shared="true">
+        <return-type type="void" />
+      </method>
+      <method name="PushStartup" cname="gtk_moz_embed_push_startup" shared="true">
+        <return-type type="void" />
+      </method>
+      <method name="Reload" cname="gtk_moz_embed_reload">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gint32" name="flags" />
+        </parameters>
+      </method>
+      <method name="RenderData" cname="gtk_moz_embed_render_data">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-char*" name="data" />
+          <parameter type="guint32" name="len" />
+          <parameter type="const-char*" name="base_uri" />
+          <parameter type="const-char*" name="mime_type" />
+        </parameters>
+      </method>
+      <method name="SetChromeMask" cname="gtk_moz_embed_set_chrome_mask">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="guint32" name="flags" />
+        </parameters>
+      </method>
+      <method name="SetCompPath" cname="gtk_moz_embed_set_comp_path" shared="true">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="char*" name="aPath" />
+        </parameters>
+      </method>
+      <method name="SetProfilePath" cname="gtk_moz_embed_set_profile_path" shared="true">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="char*" name="aDir" />
+          <parameter type="char*" name="aName" />
+        </parameters>
+      </method>
+      <method name="StatusEnumsGetType" cname="gtk_moz_embed_status_enums_get_type" shared="true" hidden="1">
+        <return-type type="GtkType" />
+      </method>
+      <method name="StopLoad" cname="gtk_moz_embed_stop_load">
+        <return-type type="void" />
+      </method>
+    </object>
+    <object name="Single" cname="GtkMozEmbedSingle" parent="GtkObject">
+      <field cname="data" type="void*" />
+      <signal name="NewWindowOrphan" cname="new_window_orphan" when="FIRST" hidden="1">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbedSingle*" name="embed" />
+          <parameter type="GtkMozEmbed**" name="newEmbed" />
+          <parameter type="guint" name="chromemask" />
+        </parameters>
+      </signal>
+      <method name="Get" cname="gtk_moz_embed_single_get" shared="true">
+        <return-type type="GtkMozEmbedSingle*" />
+      </method>
+      <method name="GetType" cname="gtk_moz_embed_single_get_type" shared="true">
+        <return-type type="GtkType" />
+      </method>
+    </object>
+  </namespace>
+</api>
\ No newline at end of file

Modified: trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile
===================================================================
--- trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile	2004-01-22 05:20:02 UTC (rev 613)
@@ -12,5 +12,6 @@
 	@ mcs /debug /out:$(DLL) /target:library /r:System.Drawing.dll \
 		/r:../../../../build/bin/ICSharpCode.Core.dll \
 		/r:../../../../build/bin/SharpDevelop.Base.dll \
-		/r:gtk-sharp.dll /r:gtkmozembed-sharp.dll \
+		/r:../../../../build/bin/gtkmozembed-sharp.dll \
+		/r:gtk-sharp.dll \
 		$(SOURCES)

Modified: trunk/MonoDevelop/src/Main/Base/Makefile
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile	2004-01-22 02:18:49 UTC (rev 612)
+++ trunk/MonoDevelop/src/Main/Base/Makefile	2004-01-22 05:20:02 UTC (rev 613)
@@ -362,7 +362,7 @@
 		/r:System.Data.dll /r:System.Web.Services.dll /define:LINUX \
 		/define:GTK /r:gtk-sharp.dll /r:gdk-sharp.dll /r:glib-sharp.dll \
 		/r:pango-sharp.dll \
-		/r:gtkmozembed-sharp.dll \
+		/r:../../../build/bin/gtkmozembed-sharp.dll \
 		/r:glade-sharp.dll \
 		/r:gnome-sharp.dll \
 		$(SOURCES)




More information about the Monodevelop-patches-list mailing list