Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Looks like comct332.ocx isn't a common fixture on windows installs. Removing

Browse Source 
dependency for now so people can compile.
[not part of build]
This commit is contained in:
ben%netscape.com 2001-06-27 19:41:52 +00:00
parent 1192135929
commit 2aad152eeb
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/manticore/makefile.win
View File

@ -47,7 +47,7 @@ _CS_XML_IMPORTS=/R:System.DLL /R:System.Data.DLL /R:System.XML.DLL
_CS_LAYOUT_IMPORTS=/R:AxSHDocVw.DLL /R:MSHTML.DLL /R:AxMOZILLACONTROLLib.DLL /R:MOZILLACONTROLLib.dll
_CS_CTL_IMPORTS=/R:StdFormat.dll /R:MSDATASRC.dll /R:stdole.dll /R:AxComCtl3.dll /R:ComCtl3.dll /R:VBRUN.dll
_IMPORTS=$(_CS_WINFORMS_IMPORTS) $(_CS_XMLIMPORTS) $(_CS_LAYOUT_IMPORTS) $(_CS_CTL_IMPORTS)
_IMPORTS=$(_CS_WINFORMS_IMPORTS) $(_CS_XMLIMPORTS) $(_CS_LAYOUT_IMPORTS)
_DEBUG_FLAGS=/optimize+
!if defined(MOZ_DEBUG)
@ -83,10 +83,6 @@ bindings:
aximp $(MOZ_SRC)\mozilla\dist\$(SUBDIR)\bin\mozctl.dll
tlbimp $(MOZ_SRC)\mozilla\dist\$(SUBDIR)\bin\mozctl.dll
control:
aximp c:\WINNT\system32\comct332.ocx
tlbimp c:\WINNT\system32\comct332.ocx
# XXX fix me
clean:
for %i in ( $(CLEANUP) ) do del %i

9
extensions/manticore/toolkit/toolkit.toolbars.cs
View File

@ -44,6 +44,7 @@ namespace Silverstone.Manticore.Toolkit.Toolbars
using System.IO;
using System.Xml;
/*
// We want to replace use of Coolbar with our own widget, just
// not right now.
using stdole;
@ -52,18 +53,19 @@ namespace Silverstone.Manticore.Toolkit.Toolbars
using StdFormat;
using VBRUN;
//using ComCtl3;
*/
public class ToolbarBuilder
{
private String mToolbarFile;
public AxCoolBar mToolbar;
//public AxCoolBar mToolbar;
public Hashtable mItems;
public ToolbarBuilder(String file)
{
mToolbarFile = file;
mToolbar = new AxCoolBar();
// mToolbar = new AxCoolBar();
mItems = new Hashtable();
}
@ -102,8 +104,7 @@ namespace Silverstone.Manticore.Toolkit.Toolbars
String key = tbvalues[0];
String label = tbvalues[1];
String visible = tbvalues[3];
Console.WriteLine(mToolbar.Bands);
mToolbar.Bands.Add(bandIndex++, key, label, null, needNewRow, null, visible != "false");
// mToolbar.Bands.Add(bandIndex++, key, label, null, needNewRow, null, visible != "false");
needNewRow = false;
break;
case "toolbarbutton":