Author: zbowling
Date: 2006-05-19 21:31:43 -0400 (Fri, 19 May 2006)
New Revision: 60884

Modified:
   trunk/mozembed/configure.in
   trunk/mozembed/src/EmbedPrivate.cpp
   trunk/mozembed/src/Makefile.am
   trunk/mozembed/src/embedutils.cpp
   trunk/mozembed/src/embedutils.h
   trunk/mozembed/tests/browser/WebBrowser.cs
   trunk/mozembed/tests/browser/browser.mdp
Log:
no more gecko-sdk

Modified: trunk/mozembed/configure.in
===================================================================
--- trunk/mozembed/configure.in 2006-05-20 00:12:47 UTC (rev 60883)
+++ trunk/mozembed/configure.in 2006-05-20 01:31:43 UTC (rev 60884)
@@ -142,7 +142,7 @@
 MOZILLA_CFLAGS="$MOZILLA_CFLAGS -I$mozilla_includes"
 for subdir in unix dom windowwatcher webbrowserpersist appcomps find txtsvc \
               docshell shistory webshell gfx necko widget content layout \
-              browser webbrwsr uconv embed_base uriloader editor \
+              browser webbrwsr uconv embed_base uriloader editor 
embedcomponents\
               commandhandler composer pref profdirserviceprovider unicharutil 
; do
     MOZILLA_CFLAGS="$MOZILLA_CFLAGS -I$mozilla_includes/$subdir"
 done

Modified: trunk/mozembed/src/EmbedPrivate.cpp
===================================================================
--- trunk/mozembed/src/EmbedPrivate.cpp 2006-05-20 00:12:47 UTC (rev 60883)
+++ trunk/mozembed/src/EmbedPrivate.cpp 2006-05-20 01:31:43 UTC (rev 60884)
@@ -19,7 +19,7 @@
 #include "EmbedContentListener.h"
 #include "EmbedEventListener.h"
 #include "EmbedWindowCreator.h"
-//#include "embedutils.h"
+#include "embedutils.h"
 
 /* Unsafe includes */
 //#define MOZILLA_INTERNAL_API
@@ -434,7 +434,7 @@
        return;
     }
 
-    rv = NS_InitEmbedding(binDir, sAppFileLocProvider);
+    rv = mozembed_util_InitEmbedding(binDir, sAppFileLocProvider);
     if (NS_FAILED(rv))
       return;
 
@@ -489,7 +489,7 @@
     }
 
     // shut down XPCOM/Embedding
-    NS_TermEmbedding();
+    mozembed_util_TermEmbedding();
   }
 }
 

Modified: trunk/mozembed/src/Makefile.am
===================================================================
--- trunk/mozembed/src/Makefile.am      2006-05-20 00:12:47 UTC (rev 60883)
+++ trunk/mozembed/src/Makefile.am      2006-05-20 01:31:43 UTC (rev 60884)
@@ -36,9 +36,8 @@
 libmozembedcli_la_LIBADD = \
        $(MOZILLA_LIBS) \
        -lnspr4 \
-       -lxpcomglue \
+       -lxpcom \
        -lplds4 \
-       -lplc4 \
-       -lembed_base_s 
+       -lplc4 
 
 libmozembedcli_la_LDFLAGS = -version-info 0:0:0 -export-dynamic -fno-rtti 
-fno-exceptions

Modified: trunk/mozembed/src/embedutils.cpp
===================================================================
--- trunk/mozembed/src/embedutils.cpp   2006-05-20 00:12:47 UTC (rev 60883)
+++ trunk/mozembed/src/embedutils.cpp   2006-05-20 01:31:43 UTC (rev 60884)
@@ -12,30 +12,28 @@
  * Portions created by Christopher Blizzard are Copyright (C) Christopher 
Blizzard.  All Rights Reserved.
  */
 
-#define MOZILLA_INTERNAL_API
 #include <nscore.h>
 #include <nsXPCOM.h>
-#undef MOZILLA_INTERNAL_API
 
 #include <nsIServiceManager.h>
 #include <nsIComponentManager.h>
 #include <nsIComponentRegistrar.h>
-//#include <nsIAppStartupNotifier.h>
+#include <nsIAppStartupNotifier.h>
 //#include <nsIStringBundle.h>
 #include <nsIDirectoryService.h>
 #include <nsDirectoryServiceDefs.h>
 #include <nsXPCOM.h>
-#define MOZILLA_INTERNAL_API
-#include <nsEmbedAPI.h>
-#undef MOZILLA_INTERNAL_API
-#define INLINEBUILD
+//#define MOZILLA_INTERNAL_API
+//#include <nsEmbedAPI.h>
+//#undef MOZILLA_INTERNAL_API
 
+
 static nsIServiceManager *sServiceManager = nsnull;
 static PRUint32           sRegistryInitialized = PR_FALSE;
 static PRUint32           sInitCounter = 0;
 
 nsresult
-mozembed_util_InitEmbedding(nsILocalFile *mozBinDirectory,
+mozembed_util_InitEmbedding(nsIFile *mozBinDirectory,
                  nsIDirectoryServiceProvider *appFileLocProvider,
                  nsStaticModuleInfo const *aStaticComponents,
                  PRUint32 aStaticComponentCount)
@@ -59,7 +57,7 @@
       // Initialise XPCOM
       rv = NS_InitXPCOM3(&sServiceManager, mozBinDirectory, appFileLocProvider,
                        aStaticComponents, aStaticComponentCount);
-      //NS _ENSURE_SUCCESS(rv, rv);
+      NS_ENSURE_SUCCESS(rv, rv);
                 
     }
     

Modified: trunk/mozembed/src/embedutils.h
===================================================================
--- trunk/mozembed/src/embedutils.h     2006-05-20 00:12:47 UTC (rev 60883)
+++ trunk/mozembed/src/embedutils.h     2006-05-20 01:31:43 UTC (rev 60884)
@@ -27,7 +27,7 @@
 
 
 nsresult
-mozembed_util_InitEmbedding    (nsILocalFile *aMozBinDirectory,
+mozembed_util_InitEmbedding    (nsIFile *aMozBinDirectory,
                                 nsIDirectoryServiceProvider 
*aAppFileLocProvider,
                                 nsStaticModuleInfo const *aStaticComponents = 
nsnull,
                                 PRUint32 aStaticComponentCount = 0);

Modified: trunk/mozembed/tests/browser/WebBrowser.cs
===================================================================
--- trunk/mozembed/tests/browser/WebBrowser.cs  2006-05-20 00:12:47 UTC (rev 
60883)
+++ trunk/mozembed/tests/browser/WebBrowser.cs  2006-05-20 01:31:43 UTC (rev 
60884)
@@ -1,4 +1,4 @@
-
+#define _DEBUG_
 using System;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
@@ -20,15 +20,15 @@
 
                protected override void OnHandleCreated(EventArgs e)
                {
-                       MozillaInvoke.mozembed_init(nptr, this.Handle);
+                       Console.WriteLine("Handle Create");
                        base.OnHandleCreated(e);
+                       MozillaInvoke.mozembed_init(nptr, this.Handle);
+                       
                }
                
                SizeInfo IWebBrowser.GetControlSize()
                {
-#if _DEBUG_
           Console.WriteLine("GetControlSize Signal");
-#endif
                  SizeInfo sz;
                  sz.width = (uint)this.Width;
                  sz.height = (uint)this.Height;
@@ -37,79 +37,57 @@
         
                void IWebBrowser.OnJSStatus()
                {
-#if _DEBUG_
           Console.WriteLine("JSStatus Signal");
-#endif
                }
 
                void IWebBrowser.OnLinkStatus()
                {
-#if _DEBUG_
           Console.WriteLine("JSStatus Signal");
-#endif
                }
 
                void IWebBrowser.OnDestoryBrowser()
                {
-#if _DEBUG_
           Console.WriteLine("OnDestoryBrowser Signal");
-#endif         
                }
                
                void IWebBrowser.OnClientSizeTo(Int32 width, Int32 height)
                {
-#if _DEBUG_
-          Console.WriteLine("OnClientSizeTo Signal - Width: {0}, Height: {1}", 
width, height);
-#endif         
+          Console.WriteLine("OnClientSizeTo Signal - Width: {0}, Height: {1}", 
width, height); 
                }
                
                void IWebBrowser.OnFocusNext()
                {
-#if _DEBUG_
           Console.WriteLine("OnFocusNext Signal");
-#endif
                }
                
                void IWebBrowser.OnFocusPrev()
                {
-#if _DEBUG_
           Console.WriteLine("OnFocusPrev Signal");
-#endif
                }
                
                void IWebBrowser.OnTitleChanged()
                {
-#if _DEBUG_
           Console.WriteLine("OnTitleChanged Signal");
-#endif
                }
                
                void IWebBrowser.OnShowTooltipWindow(Int32 x, Int32 y, string 
tiptext)
                {
-#if _DEBUG_
           Console.WriteLine("OnShowTooltipWindow Signal - x: {0}, y: {1}, 
text: {2}", x, y,tiptext);
-#endif         
                }
 
                void IWebBrowser.OnHideTooltipWindow()
                {
-#if _DEBUG_
           Console.WriteLine("OnHideTooltipWindow Signal");
-#endif
                }
 
                void IWebBrowser.OnStateNetStart()
                {
-#if _DEBUG_
           Console.WriteLine("OnStateNetStart Signal");
-#endif
                }
 
                void IWebBrowser.OnStateNetStop()
                {
-#if _DEBUG_
           Console.WriteLine("OnStateNetStop Signal");
-#endif
                }
 
                void IWebBrowser.OnStateSpecial(UInt32 stateFlags, Int32 status)

Modified: trunk/mozembed/tests/browser/browser.mdp
===================================================================
--- trunk/mozembed/tests/browser/browser.mdp    2006-05-20 00:12:47 UTC (rev 
60883)
+++ trunk/mozembed/tests/browser/browser.mdp    2006-05-20 01:31:43 UTC (rev 
60884)
@@ -24,6 +24,7 @@
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, 
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Windows.Forms, 
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Project" localcopy="True" refto="mozilla" />
+    <ProjectReference type="Assembly" localcopy="True" 
refto="../../webbrowser/bin/Debug/mozilla.dll" />
+    <ProjectReference type="Assembly" localcopy="True" 
refto="../../webbrowser/bin/Debug/Mono.Mozilla.dll" />
   </References>
 </Project>
\ No newline at end of file

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to