Author: andreia
Date: 2007-10-18 15:58:39 -0400 (Thu, 18 Oct 2007)
New Revision: 87796
Modified:
trunk/mcs/class/Mono.Mozilla/ChangeLog
trunk/mcs/class/Mono.Mozilla/Mono.Mozilla/Base.cs
Log:
2007-10-18 Andreia Gaita <[EMAIL PROTECTED]>
* use the newly-renamed gluezilla library
Modified: trunk/mcs/class/Mono.Mozilla/ChangeLog
===================================================================
--- trunk/mcs/class/Mono.Mozilla/ChangeLog 2007-10-18 19:55:28 UTC (rev
87795)
+++ trunk/mcs/class/Mono.Mozilla/ChangeLog 2007-10-18 19:58:39 UTC (rev
87796)
@@ -1,3 +1,7 @@
+2007-10-18 Andreia Gaita <[EMAIL PROTECTED]>
+
+ * use the newly-renamed gluezilla library
+
2007-10-07 Andreia Gaita <[EMAIL PROTECTED]>
* More dialog event options.
Modified: trunk/mcs/class/Mono.Mozilla/Mono.Mozilla/Base.cs
===================================================================
--- trunk/mcs/class/Mono.Mozilla/Mono.Mozilla/Base.cs 2007-10-18 19:55:28 UTC
(rev 87795)
+++ trunk/mcs/class/Mono.Mozilla/Mono.Mozilla/Base.cs 2007-10-18 19:58:39 UTC
(rev 87796)
@@ -35,17 +35,17 @@
internal class Base
{
private static Hashtable boundControls;
- internal static bool xulbrowserInstalled;
+ internal static bool gluezillaInstalled;
private class BindingInfo
{
public CallbackBinder callback;
- public IntPtr xulbrowser;
+ public IntPtr gluezilla;
}
private static bool isInitialized ()
{
- if (!xulbrowserInstalled)
+ if (!gluezillaInstalled)
return false;
return true;
}
@@ -67,7 +67,7 @@
public static void DebugStartup ()
{
- xulbrowser_debug_startup ();
+ gluezilla_debug_startup ();
Trace.Listeners.Add (new TextWriterTraceListener
(@"log"));
Trace.AutoFlush = true;
}
@@ -80,15 +80,15 @@
Marshal.StructureToPtr (info.callback, ptrCallback,
true);
try {
- info.xulbrowser = xulbrowser_init (ptrCallback,
Environment.CurrentDirectory);
+ info.gluezilla = gluezilla_init (ptrCallback,
Environment.CurrentDirectory);
}
catch (DllNotFoundException) {
- Console.WriteLine ("libxulbrowser not found. To
have webbrowser support, you need libxulbrowser installed");
+ Console.WriteLine ("libgluezilla not found. To
have webbrowser support, you need libgluezilla installed");
Marshal.FreeHGlobal (ptrCallback);
- xulbrowserInstalled = false;
+ gluezillaInstalled = false;
return;
}
- xulbrowserInstalled = true;
+ gluezillaInstalled = true;
boundControls.Add (control as IWebBrowser, info);
DebugStartup ();
}
@@ -99,7 +99,7 @@
return;
BindingInfo info = getBinding (control);
- xulbrowser_shutdown (info.xulbrowser);
+ gluezilla_shutdown (info.gluezilla);
}
public static void Bind (IWebBrowser control, IntPtr handle,
int width, int height)
@@ -108,7 +108,7 @@
return;
BindingInfo info = getBinding (control);
- xulbrowser_createBrowserWindow (info.xulbrowser,
handle, width, height);
+ gluezilla_createBrowserWindow (info.gluezilla, handle,
width, height);
}
// layout
@@ -118,7 +118,7 @@
return;
BindingInfo info = getBinding (control);
- xulbrowser_focus (info.xulbrowser, focus);
+ gluezilla_focus (info.gluezilla, focus);
}
@@ -128,7 +128,7 @@
return;
BindingInfo info = getBinding (control);
- xulbrowser_deactivate (info.xulbrowser);
+ gluezilla_deactivate (info.gluezilla);
}
public static void Activate (IWebBrowser control)
@@ -137,7 +137,7 @@
return;
BindingInfo info = getBinding (control);
- xulbrowser_activate (info.xulbrowser);
+ gluezilla_activate (info.gluezilla);
}
public static void Deactivate (IWebBrowser control)
@@ -146,7 +146,7 @@
return;
BindingInfo info = getBinding (control);
- xulbrowser_deactivate (info.xulbrowser);
+ gluezilla_deactivate (info.gluezilla);
}
public static void Resize (IWebBrowser control, int width, int
height)
@@ -155,7 +155,7 @@
return;
BindingInfo info = getBinding (control);
- xulbrowser_resize (info.xulbrowser, width, height);
+ gluezilla_resize (info.gluezilla, width, height);
}
// navigation
@@ -165,7 +165,7 @@
return;
BindingInfo info = getBinding (control);
- xulbrowser_navigate (info.xulbrowser, uri);
+ gluezilla_navigate (info.gluezilla, uri);
}
@@ -175,7 +175,7 @@
return false;
BindingInfo info = getBinding (control);
- return xulbrowser_forward (info.xulbrowser);
+ return gluezilla_forward (info.gluezilla);
}
public static bool Back (IWebBrowser control)
@@ -184,7 +184,7 @@
return false;
BindingInfo info = getBinding (control);
- return xulbrowser_back (info.xulbrowser);
+ return gluezilla_back (info.gluezilla);
}
public static void Home (IWebBrowser control)
@@ -193,7 +193,7 @@
return;
BindingInfo info = getBinding (control);
- xulbrowser_home (info.xulbrowser);
+ gluezilla_home (info.gluezilla);
}
public static void Stop (IWebBrowser control)
@@ -202,7 +202,7 @@
return;
BindingInfo info = getBinding (control);
- xulbrowser_stop (info.xulbrowser);
+ gluezilla_stop (info.gluezilla);
}
public static void Reload (IWebBrowser control, ReloadOption
option)
@@ -211,7 +211,7 @@
return;
BindingInfo info = getBinding (control);
- xulbrowser_reload (info.xulbrowser, option);
+ gluezilla_reload (info.gluezilla, option);
}
public static nsIDOMHTMLDocument GetDOMDocument (IWebBrowser
control)
@@ -220,81 +220,81 @@
return null;
BindingInfo info = getBinding (control);
- return xulbrowser_getDomDocument (info.xulbrowser);
+ return gluezilla_getDomDocument (info.gluezilla);
}
public static IntPtr StringInit ()
{
- return xulbrowser_stringInit ();
+ return gluezilla_stringInit ();
}
public static void StringFinish (HandleRef str)
{
- xulbrowser_stringFinish (str);
+ gluezilla_stringFinish (str);
}
public static string StringGet (HandleRef str)
{
- IntPtr p = xulbrowser_stringGet (str);
+ IntPtr p = gluezilla_stringGet (str);
return Marshal.PtrToStringUni (p);
}
public static void StringSet (HandleRef str, string text)
{
- xulbrowser_stringSet (str, text);
+ gluezilla_stringSet (str, text);
}
#region pinvokes
- [DllImport("xulbrowser")]
- private static extern void xulbrowser_debug_startup();
+ [DllImport("gluezilla")]
+ private static extern void gluezilla_debug_startup();
- [DllImport("xulbrowser")]
- private static extern IntPtr xulbrowser_init (IntPtr events,
string startDir);
+ [DllImport("gluezilla")]
+ private static extern IntPtr gluezilla_init (IntPtr events,
string startDir);
- [DllImport ("xulbrowser")]
- private static extern IntPtr xulbrowser_shutdown (IntPtr
instance);
+ [DllImport ("gluezilla")]
+ private static extern IntPtr gluezilla_shutdown (IntPtr
instance);
- [DllImport ("xulbrowser")]
- private static extern int xulbrowser_createBrowserWindow
(IntPtr instance, IntPtr hwnd, Int32 width, Int32 height);
+ [DllImport ("gluezilla")]
+ private static extern int gluezilla_createBrowserWindow (IntPtr
instance, IntPtr hwnd, Int32 width, Int32 height);
// layout
- [DllImport ("xulbrowser")]
- private static extern int xulbrowser_focus (IntPtr instance,
FocusOption focus);
- [DllImport ("xulbrowser")]
- private static extern int xulbrowser_blur (IntPtr instance);
- [DllImport ("xulbrowser")]
- private static extern int xulbrowser_activate (IntPtr instance);
- [DllImport ("xulbrowser")]
- private static extern int xulbrowser_deactivate (IntPtr
instance);
- [DllImport ("xulbrowser")]
- private static extern int xulbrowser_resize (IntPtr instance,
Int32 width, Int32 height);
+ [DllImport ("gluezilla")]
+ private static extern int gluezilla_focus (IntPtr instance,
FocusOption focus);
+ [DllImport ("gluezilla")]
+ private static extern int gluezilla_blur (IntPtr instance);
+ [DllImport ("gluezilla")]
+ private static extern int gluezilla_activate (IntPtr instance);
+ [DllImport ("gluezilla")]
+ private static extern int gluezilla_deactivate (IntPtr
instance);
+ [DllImport ("gluezilla")]
+ private static extern int gluezilla_resize (IntPtr instance,
Int32 width, Int32 height);
// navigation
- [DllImport("xulbrowser")]
- private static extern int xulbrowser_navigate (IntPtr instance,
string uri);
- [DllImport ("xulbrowser")]
- private static extern bool xulbrowser_forward (IntPtr instance);
- [DllImport ("xulbrowser")]
- private static extern bool xulbrowser_back (IntPtr instance);
- [DllImport ("xulbrowser")]
- private static extern int xulbrowser_home (IntPtr instance);
- [DllImport ("xulbrowser")]
- private static extern int xulbrowser_stop (IntPtr instance);
- [DllImport ("xulbrowser")]
- private static extern int xulbrowser_reload (IntPtr instance,
ReloadOption option);
+ [DllImport("gluezilla")]
+ private static extern int gluezilla_navigate (IntPtr instance,
string uri);
+ [DllImport ("gluezilla")]
+ private static extern bool gluezilla_forward (IntPtr instance);
+ [DllImport ("gluezilla")]
+ private static extern bool gluezilla_back (IntPtr instance);
+ [DllImport ("gluezilla")]
+ private static extern int gluezilla_home (IntPtr instance);
+ [DllImport ("gluezilla")]
+ private static extern int gluezilla_stop (IntPtr instance);
+ [DllImport ("gluezilla")]
+ private static extern int gluezilla_reload (IntPtr instance,
ReloadOption option);
// dom
- [DllImport ("xulbrowser")]
- private static extern nsIDOMHTMLDocument
xulbrowser_getDomDocument (IntPtr instance);
+ [DllImport ("gluezilla")]
+ private static extern nsIDOMHTMLDocument
gluezilla_getDomDocument (IntPtr instance);
- [DllImport ("xulbrowser")]
- private static extern IntPtr xulbrowser_stringInit ();
- [DllImport ("xulbrowser")]
- private static extern int xulbrowser_stringFinish (HandleRef
str);
- [DllImport ("xulbrowser")]
- private static extern IntPtr xulbrowser_stringGet (HandleRef
str);
- [DllImport ("xulbrowser")]
- private static extern void xulbrowser_stringSet (HandleRef str,
[MarshalAs (UnmanagedType.LPWStr)] string text);
+ [DllImport ("gluezilla")]
+ private static extern IntPtr gluezilla_stringInit ();
+ [DllImport ("gluezilla")]
+ private static extern int gluezilla_stringFinish (HandleRef
str);
+ [DllImport ("gluezilla")]
+ private static extern IntPtr gluezilla_stringGet (HandleRef
str);
+ [DllImport ("gluezilla")]
+ private static extern void gluezilla_stringSet (HandleRef str,
[MarshalAs (UnmanagedType.LPWStr)] string text);
#endregion
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
