зеркало из https://github.com/mozilla/gecko-dev.git
Remove MozillaControl.html. b=150618 r=chak@netscape.com sr=rpotts@netscape.com
This commit is contained in:
Родитель
1dbe5517cd
Коммит
0d6ab7480f
|
@ -110,12 +110,6 @@ DEFINES += -DMOZ_ACTIVEX_CONTROL_SUPPORT
|
||||||
|
|
||||||
LOCAL_INCLUDES += -I.
|
LOCAL_INCLUDES += -I.
|
||||||
|
|
||||||
libs:: MozillaControl.html
|
|
||||||
$(INSTALL) $^ $(DIST)/bin/res
|
|
||||||
|
|
||||||
install:: MozillaControl.html
|
|
||||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res
|
|
||||||
|
|
||||||
export:: $(DEFFILE) done_gen
|
export:: $(DEFFILE) done_gen
|
||||||
|
|
||||||
$(DEFFILE): mkctldef.sh
|
$(DEFFILE): mkctldef.sh
|
||||||
|
|
|
@ -116,7 +116,7 @@ public:
|
||||||
// Prefs
|
// Prefs
|
||||||
|
|
||||||
static const char *c_szPrefsHomePage = "browser.startup.homepage";
|
static const char *c_szPrefsHomePage = "browser.startup.homepage";
|
||||||
static const char *c_szDefaultPage = "resource:/res/MozillaControl.html";
|
static const char *c_szDefaultPage = "data:text/html,<html><body bgcolor=\"#00FF00\"><p>Mozilla Control</p></body></html>";
|
||||||
|
|
||||||
// Registry keys and values
|
// Registry keys and values
|
||||||
|
|
||||||
|
@ -2623,14 +2623,14 @@ HRESULT STDMETHODCALLTYPE CMozillaBrowser::get_Visible(VARIANT_BOOL __RPC_FAR *p
|
||||||
RETURN_E_UNEXPECTED();
|
RETURN_E_UNEXPECTED();
|
||||||
}
|
}
|
||||||
|
|
||||||
NG_ASSERT_POINTER(pBool, int);
|
NG_ASSERT_POINTER(pBool, VARIANT_BOOL);
|
||||||
if (pBool == NULL)
|
if (pBool == NULL)
|
||||||
{
|
{
|
||||||
RETURN_E_INVALIDARG();
|
RETURN_E_INVALIDARG();
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO: Implement get_Visible
|
//TODO: Implement get_Visible?
|
||||||
*pBool = VARIANT_FALSE;
|
*pBool = VARIANT_TRUE;
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2645,7 +2645,7 @@ HRESULT STDMETHODCALLTYPE CMozillaBrowser::put_Visible(VARIANT_BOOL Value)
|
||||||
RETURN_E_UNEXPECTED();
|
RETURN_E_UNEXPECTED();
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO: Implement put_Visible
|
//TODO: Implement put_Visible?
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,6 @@ PATH=$(DIST)\bin;$(PATH)
|
||||||
|
|
||||||
libs:: $(DLL)
|
libs:: $(DLL)
|
||||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin
|
$(MAKE_INSTALL) $(DLL) $(DIST)\bin
|
||||||
$(MAKE_INSTALL) MozillaControl.html $(DIST)\bin\res
|
|
||||||
|
|
||||||
clobber::
|
clobber::
|
||||||
-del $(DEFFILE)
|
-del $(DEFFILE)
|
||||||
|
|
|
@ -7,11 +7,6 @@
|
||||||
|
|
||||||
[Embed]
|
[Embed]
|
||||||
|
|
||||||
;
|
|
||||||
; ActiveX control
|
|
||||||
;
|
|
||||||
res\MozillaControl.html
|
|
||||||
|
|
||||||
; layout
|
; layout
|
||||||
res\dtd\*
|
res\dtd\*
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче