Author: andreia
Date: 2008-01-27 11:04:40 -0500 (Sun, 27 Jan 2008)
New Revision: 94054
Modified:
trunk/gluezilla/src/ChangeLog
trunk/gluezilla/src/Widget.cpp
trunk/gluezilla/src/gluezilla2K5.vcproj
Log:
* Widget.cpp: Add proxy defines in case we're building against a local
xulrunner in build/ (see ChangeLog in build/)
2008-01-26 Andreia Gaita <[EMAIL PROTECTED]>
Modified: trunk/gluezilla/src/ChangeLog
===================================================================
--- trunk/gluezilla/src/ChangeLog 2008-01-27 15:57:45 UTC (rev 94053)
+++ trunk/gluezilla/src/ChangeLog 2008-01-27 16:04:40 UTC (rev 94054)
@@ -1,3 +1,8 @@
+2008-01-26 Andreia Gaita <[EMAIL PROTECTED]>
+
+ * Widget.cpp: Add proxy defines in case we're building against a local
+ xulrunner in build/ (see ChangeLog in build/)
+
2008-01-24 Andreia Gaita <[EMAIL PROTECTED]>
* BrowserWindow.cpp (OnStateChange): send progress events up
Modified: trunk/gluezilla/src/Widget.cpp
===================================================================
--- trunk/gluezilla/src/Widget.cpp 2008-01-27 15:57:45 UTC (rev 94053)
+++ trunk/gluezilla/src/Widget.cpp 2008-01-27 16:04:40 UTC (rev 94054)
@@ -24,6 +24,18 @@
#endif
+// nsIProxyObjectManager includes nsProxyEvent.h, which brings
+// all kinds of ugly dependencies with it, completely unnecessarily
+// since the only thing that is really needed in that header are these
+// three definitions. Hence, the idl that is included in the build/idl_extras
+// has the include commented out. If we are building against that idl/header,
+// we use these definitions instead.
+#ifndef PROXY_SYNC
+#define PROXY_SYNC 0x0001 // acts just like a function call.
+#define PROXY_ASYNC 0x0002 // fire and forget. This will return
immediately and you will lose all return information.
+#define PROXY_ALWAYS 0x0004 // ignore check to see if the eventQ is on the
same thread as the caller, and alway return a proxied object.
+#endif
+
PRUint32 Widget::widgetCount = 0;
static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
Modified: trunk/gluezilla/src/gluezilla2K5.vcproj
===================================================================
--- trunk/gluezilla/src/gluezilla2K5.vcproj 2008-01-27 15:57:45 UTC (rev
94053)
+++ trunk/gluezilla/src/gluezilla2K5.vcproj 2008-01-27 16:04:40 UTC (rev
94054)
@@ -111,6 +111,7 @@
IntermediateDirectory=".\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -131,7 +132,7 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\build\include;..\build\include\xpcom;..\build\include\string;..\build\include\nspr"
PreprocessorDefinitions="XPCOM_GLUE;NO_BUILD_REFCNT_LOGGING"
- RuntimeLibrary="2"
+ RuntimeLibrary="0"
ObjectFile="$(IntDir)\obj\"
ProgramDataBaseFileName="$(IntDir)\obj\"
DisableSpecificWarnings="4005;4996"
@@ -150,6 +151,8 @@
Name="VCLinkerTool"
AdditionalDependencies="xpcomglue.lib
advapi32.lib"
AdditionalLibraryDirectories="..\build\lib"
+ IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames="libcmt"
ErrorReporting="0"
/>
<Tool
@@ -296,6 +299,10 @@
>
</Filter>
<File
+ RelativePath=".\ChangeLog"
+ >
+ </File>
+ <File
RelativePath=".\Makefile"
>
</File>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
