diff options
| author | Lillian Angel <langel@redhat.com> | 2005-07-12 18:57:59 +0000 |
|---|---|---|
| committer | Lillian Angel <langel@redhat.com> | 2005-07-12 18:57:59 +0000 |
| commit | de0cd9152f96038396fb1af3d02e5cbe9a849899 (patch) | |
| tree | 946db5dd37ead34df1d196d65342e9dcc891842f /lib | |
| parent | c53548545878c28edcfc6588f677b6cce6fec680 (diff) | |
| download | classpath-de0cd9152f96038396fb1af3d02e5cbe9a849899.tar.gz | |
2005-07-12 Lillian Angel <langel@redhat.com>
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Took out icon defaults.
* javax/swing/plaf/basic/BasicTreeUI.java
(installUI): set root to visible
(getCellBounds): took out addition to width since there may not be an icon.
* javax/swing/plaf/metal/MetalLookAndFeel.java:
Added in icon defaults
* lib/Makefile.am:
Fixed so icons are installed for the JTree
For icons to install properly: make sure you rebuild, reconfigure and delete the lib/resources file
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 6fbc9c1ef..983622dab 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -8,7 +8,7 @@ sinclude $(JAVA_DEPEND) propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print) propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -name \*\.properties -print) metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -path \*/CVS -prune -o -type f -print) -iconfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu -name *.png -type f -print) +iconfiles := $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print) compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:.:$(USER_CLASSLIB) @@ -58,7 +58,6 @@ install-data-local: genclasses compile-classes cp -R javax $(DESTDIR)$(pkgdatadir) cp -R org $(DESTDIR)$(pkgdatadir) cp -R META-INF $(DESTDIR)$(pkgdatadir) - cp -R icons $(DESTDIR)$(pkgdatadir) # FIXME - should mimic doc/api/Makefile.am instead... uninstall-local: @@ -67,7 +66,6 @@ uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir)/javax rm -rf $(DESTDIR)$(pkgdatadir)/org rm -rf $(DESTDIR)$(pkgdatadir)/META-INF - rm -rf $(DESTDIR)$(pkgdatadir)/icons endif # INSTALL_CLASS_FILES @@ -80,7 +78,7 @@ resources: if ! [ -e gnu ]; then mkdir gnu; fi if ! [ -e gnu/java ]; then mkdir gnu/java; fi if ! [ -e gnu/java/locale ]; then mkdir gnu/java/locale; fi - if ! [ -e gnu/icons ]; then mkdir gnu/icons; fi + if ! [ -e gnu/javax/swing/plaf/gtk/icons ]; then mkdir -p gnu/javax/swing/plaf/gtk/icons; fi @list='$(propertydirs)'; for p in $$list; do \ if ! [ -e $$p ]; then mkdir $$p; fi; \ done @@ -91,7 +89,7 @@ resources: cp $(top_srcdir)/resource/$$p $$p; \ done @list='$(iconfiles)'; for p in $$list; do \ - cp $(top_srcdir)/resource/$$p $$p; \ + cp $(top_srcdir)/$$p $$p; \ done touch resources |