Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moving loading and broken image icons to /res for embedding. b=110384 r=adamlock,sfraser sr=sfraser,waterson

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@108627 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
attinasi%netscape.com
2001-11-20 22:21:14 +00:00
parent 77f3a19327
commit e41d8f0647
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/layout/generic/nsImageFrame.cpp
View File

@@ -2036,8 +2036,8 @@ nsImageFrame::CanLoadImage(nsIURI *aURI)
nsresult nsImageFrame::LoadIcons(nsIPresContext *aPresContext)
{
nsAutoString loadingSrc(NS_LITERAL_STRING("resource:/res/html/loading-image.gif"));
nsAutoString brokenSrc(NS_LITERAL_STRING("resource:/res/html/broken-image.gif"));
NS_NAMED_LITERAL_STRING(loadingSrc,"resource:/res/loading-image.gif");
NS_NAMED_LITERAL_STRING(brokenSrc,"resource:/res/broken-image.gif");
nsresult rv = NS_OK;
PRBool doLoad = PR_FALSE; // only load icons once...

13
mozilla/layout/html/base/src/Makefile.in
View File

@@ -121,9 +121,7 @@ endif
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
RESOURCES = \
$(srcdir)/broken-image.gif \
$(srcdir)/loading-image.gif \
RESOURCES_HTML = \
$(srcdir)/gopher-audio.gif \
$(srcdir)/gopher-binary.gif \
$(srcdir)/gopher-find.gif \
@@ -135,6 +133,12 @@ RESOURCES = \
$(srcdir)/gopher-unknown.gif \
$(NULL)
RESOURCES = \
$(srcdir)/broken-image.gif \
$(srcdir)/loading-image.gif \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
@@ -152,5 +156,6 @@ INCLUDES += \
$(NULL)
install::
$(INSTALL) $(RESOURCES) $(DIST)/bin/res/html
$(INSTALL) $(RESOURCES_HTML) $(DIST)/bin/res/html
$(INSTALL) $(RESOURCES) $(DIST)/bin/res

4
mozilla/layout/html/base/src/makefile.win
View File

@@ -133,8 +133,8 @@ install:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
install::
$(MAKE_INSTALL) broken-image.gif $(DIST)\bin\res\html
$(MAKE_INSTALL) loading-image.gif $(DIST)\bin\res\html
$(MAKE_INSTALL) broken-image.gif $(DIST)\bin\res
$(MAKE_INSTALL) loading-image.gif $(DIST)\bin\res
$(MAKE_INSTALL) gopher-audio.gif $(DIST)\bin\res\html
$(MAKE_INSTALL) gopher-binary.gif $(DIST)\bin\res\html
$(MAKE_INSTALL) gopher-find.gif $(DIST)\bin\res\html

4
mozilla/layout/html/base/src/nsImageFrame.cpp
View File

@@ -2036,8 +2036,8 @@ nsImageFrame::CanLoadImage(nsIURI *aURI)
nsresult nsImageFrame::LoadIcons(nsIPresContext *aPresContext)
{
nsAutoString loadingSrc(NS_LITERAL_STRING("resource:/res/html/loading-image.gif"));
nsAutoString brokenSrc(NS_LITERAL_STRING("resource:/res/html/broken-image.gif"));
NS_NAMED_LITERAL_STRING(loadingSrc,"resource:/res/loading-image.gif");
NS_NAMED_LITERAL_STRING(brokenSrc,"resource:/res/broken-image.gif");
nsresult rv = NS_OK;
PRBool doLoad = PR_FALSE; // only load icons once...