Mercurial Mercurial > hg > stx-libwidg2 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jv
authorMerge Script
Fri, 21 Oct 2016 07:04:13 +0200
branchjv
changeset 5300 6770b182f9c4
parent 5290 572c120c7bef (current diff)
parent 5299 2aa8c9d76639 (diff)
child 5302 abd106f5239c
Merge
Make.proto file | annotate | diff | comparison | revisions
Make.spec file | annotate | diff | comparison | revisions
abbrev.stc file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
libInit.cc file | annotate | diff | comparison | revisions
stx_libwidg2.st file | annotate | diff | comparison | revisions 
--- a/HierarchicalItem.st	Thu Oct 20 06:53:17 2016 +0200
+++ b/HierarchicalItem.st	Fri Oct 21 07:04:13 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1999 by eXept Software AG
               All Rights Reserved
@@ -50,8 +48,10 @@
 "
     Hierarchical Items are mostly like Models, but the list of
     dependencies are kept by its HierarchicalList.
-    The class is used to build up hierarchical trees.
-
+    Instances of (subclasses of) me are used to build up hierarchical trees.
+    This class is usually subclassed, to add label, icon or value (reference to some info)
+    to the tree item.
+    
     [Instance variables:]
         parent      <Item, List or nil>         parent or my HierarchicalList.
         children    <Collection or nil>         list of children
@@ -289,10 +289,10 @@
 !HierarchicalItem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalItem.st,v 1.115 2015-05-15 09:23:54 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalItem.st,v 1.115 2015-05-15 09:23:54 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/HierarchicalItemWithValue.st	Fri Oct 21 07:04:13 2016 +0200
@@ -0,0 +1,83 @@
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
+"{ Package: 'stx:libwidg2' }"
+
+"{ NameSpace: Smalltalk }"
+
+HierarchicalItem subclass:#HierarchicalItemWithValue
+	instanceVariableNames:'value'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Views-Support'
+!
+
+!HierarchicalItemWithValue class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
+!
+
+documentation
+"
+    I am a Hierarchical Item with a reference to more information.
+    This class is usually subclassed, to item specific protocol.
+
+    [Instance variables:]
+        value      <any>                  
+
+    [see also:]
+        HierarchicalList
+        HierarchicalListView
+        HierarchicalItemWithLabelAndIconAndValue
+"
+! !
+
+!HierarchicalItemWithValue class methodsFor:'instance creation'!
+
+label:aLabel
+    ^ self new label:aLabel
+!
+
+value:aLabel
+    ^ self new value:aLabel
+! !
+
+!HierarchicalItemWithValue methodsFor:'accessing'!
+
+value
+    ^ value
+!
+
+value:something
+    value := something.
+! !
+
+!HierarchicalItemWithValue class methodsFor:'documentation'!
+
+version
+    ^ '$Header$'
+!
+
+version_CVS
+    ^ '$Header$'
+! !
+
--- a/Make.proto	Thu Oct 20 06:53:17 2016 +0200
+++ b/Make.proto	Fri Oct 21 07:04:13 2016 +0200
@@ -204,6 +204,7 @@
 $(OUTDIR)FilenameComboBoxView.$(O) FilenameComboBoxView.$(C) FilenameComboBoxView.$(H): FilenameComboBoxView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libwidg2/ComboBoxView.$(H) $(INCLUDE_TOP)/stx/libwidg2/ComboView.$(H) $(STCHDR)
 $(OUTDIR)HierarchicalFileList.$(O) HierarchicalFileList.$(C) HierarchicalFileList.$(H): HierarchicalFileList.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic2/List.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalList.$(H) $(STCHDR)
 $(OUTDIR)HierarchicalItemWithLabel.$(O) HierarchicalItemWithLabel.$(C) HierarchicalItemWithLabel.$(H): HierarchicalItemWithLabel.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)HierarchicalItemWithValue.$(O) HierarchicalItemWithValue.$(C) HierarchicalItemWithValue.$(H): HierarchicalItemWithValue.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
 $(OUTDIR)HierarchicalListView.$(O) HierarchicalListView.$(C) HierarchicalListView.$(H): HierarchicalListView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libwidg2/ListModelView.$(H) $(INCLUDE_TOP)/stx/libwidg2/SelectionInListModelView.$(H) $(STCHDR)
 $(OUTDIR)LabelAndIcon.$(O) LabelAndIcon.$(C) LabelAndIcon.$(H): LabelAndIcon.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/ListEntry.$(H) $(INCLUDE_TOP)/stx/libwidg2/ModelListEntry.$(H) $(STCHDR)
 $(OUTDIR)HierarchicalItemWithLabelAndIcon.$(O) HierarchicalItemWithLabelAndIcon.$(C) HierarchicalItemWithLabelAndIcon.$(H): HierarchicalItemWithLabelAndIcon.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(STCHDR)
--- a/Make.spec	Thu Oct 20 06:53:17 2016 +0200
+++ b/Make.spec	Fri Oct 21 07:04:13 2016 +0200
@@ -132,6 +132,7 @@
 	FilenameComboBoxView \
 	HierarchicalFileList \
 	HierarchicalItemWithLabel \
+	HierarchicalItemWithValue \
 	HierarchicalListView \
 	LabelAndIcon \
 	HierarchicalItemWithLabelAndIcon \
@@ -223,6 +224,7 @@
     $(OUTDIR_SLASH)FilenameComboBoxView.$(O) \
     $(OUTDIR_SLASH)HierarchicalFileList.$(O) \
     $(OUTDIR_SLASH)HierarchicalItemWithLabel.$(O) \
+    $(OUTDIR_SLASH)HierarchicalItemWithValue.$(O) \
     $(OUTDIR_SLASH)HierarchicalListView.$(O) \
     $(OUTDIR_SLASH)LabelAndIcon.$(O) \
     $(OUTDIR_SLASH)HierarchicalItemWithLabelAndIcon.$(O) \
--- a/abbrev.stc	Thu Oct 20 06:53:17 2016 +0200
+++ b/abbrev.stc	Fri Oct 21 07:04:13 2016 +0200
@@ -81,6 +81,7 @@
 FilenameComboBoxView FilenameComboBoxView stx:libwidg2 'Views-Interactors' 2
 HierarchicalFileList HierarchicalFileList stx:libwidg2 'Views-Support' 0
 HierarchicalItemWithLabel HierarchicalItemWithLabel stx:libwidg2 'Views-Support' 0
+HierarchicalItemWithValue HierarchicalItemWithValue stx:libwidg2 'Views-Support' 0
 HierarchicalListView HierarchicalListView stx:libwidg2 'Views-Trees' 2
 LabelAndIcon LabelAndIcon stx:libwidg2 'Views-Support' 0
 HierarchicalItemWithLabelAndIcon HierarchicalItemWithLabelAndIcon stx:libwidg2 'Views-Support' 0
--- a/bc.mak	Thu Oct 20 06:53:17 2016 +0200
+++ b/bc.mak	Fri Oct 21 07:04:13 2016 +0200
@@ -154,6 +154,7 @@
 $(OUTDIR)FilenameComboBoxView.$(O) FilenameComboBoxView.$(C) FilenameComboBoxView.$(H): FilenameComboBoxView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg2\ComboBoxView.$(H) $(INCLUDE_TOP)\stx\libwidg2\ComboView.$(H) $(STCHDR)
 $(OUTDIR)HierarchicalFileList.$(O) HierarchicalFileList.$(C) HierarchicalFileList.$(H): HierarchicalFileList.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalList.$(H) $(STCHDR)
 $(OUTDIR)HierarchicalItemWithLabel.$(O) HierarchicalItemWithLabel.$(C) HierarchicalItemWithLabel.$(H): HierarchicalItemWithLabel.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)HierarchicalItemWithValue.$(O) HierarchicalItemWithValue.$(C) HierarchicalItemWithValue.$(H): HierarchicalItemWithValue.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
 $(OUTDIR)HierarchicalListView.$(O) HierarchicalListView.$(C) HierarchicalListView.$(H): HierarchicalListView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg2\ListModelView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SelectionInListModelView.$(H) $(STCHDR)
 $(OUTDIR)LabelAndIcon.$(O) LabelAndIcon.$(C) LabelAndIcon.$(H): LabelAndIcon.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\ListEntry.$(H) $(INCLUDE_TOP)\stx\libwidg2\ModelListEntry.$(H) $(STCHDR)
 $(OUTDIR)HierarchicalItemWithLabelAndIcon.$(O) HierarchicalItemWithLabelAndIcon.$(C) HierarchicalItemWithLabelAndIcon.$(H): HierarchicalItemWithLabelAndIcon.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(STCHDR)
--- a/libInit.cc	Thu Oct 20 06:53:17 2016 +0200
+++ b/libInit.cc	Fri Oct 21 07:04:13 2016 +0200
@@ -95,6 +95,7 @@
 extern void _FilenameComboBoxView_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _HierarchicalFileList_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _HierarchicalItemWithLabel_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HierarchicalItemWithValue_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _HierarchicalListView_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _LabelAndIcon_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _HierarchicalItemWithLabelAndIcon_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
@@ -195,6 +196,7 @@
     _FilenameComboBoxView_Init(pass,__pRT__,snd);
     _HierarchicalFileList_Init(pass,__pRT__,snd);
     _HierarchicalItemWithLabel_Init(pass,__pRT__,snd);
+    _HierarchicalItemWithValue_Init(pass,__pRT__,snd);
     _HierarchicalListView_Init(pass,__pRT__,snd);
     _LabelAndIcon_Init(pass,__pRT__,snd);
     _HierarchicalItemWithLabelAndIcon_Init(pass,__pRT__,snd);
--- a/stx_libwidg2.st	Thu Oct 20 06:53:17 2016 +0200
+++ b/stx_libwidg2.st	Fri Oct 21 07:04:13 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -229,6 +227,7 @@
         FilenameComboBoxView
         HierarchicalFileList
         HierarchicalItemWithLabel
+        HierarchicalItemWithValue
         HierarchicalListView
         LabelAndIcon
         HierarchicalItemWithLabelAndIcon
--- a/stx_libwidg2WINrc.rc	Thu Oct 20 06:53:17 2016 +0200
+++ b/stx_libwidg2WINrc.rc	Fri Oct 21 07:04:13 2016 +0200
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libwidg2.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     7,1,1,57
+  FILEVERSION     7,1,1,58
   PRODUCTVERSION  7,1,0,0
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Additional Widgets (LIB)\0"
-      VALUE "FileVersion", "7.1.1.57\0"
+      VALUE "FileVersion", "7.1.1.58\0"
       VALUE "InternalName", "stx:libwidg2\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "7.1.0.0\0"
-      VALUE "ProductDate", "Wed, 20 Jul 2016 16:34:26 GMT\0"
+      VALUE "ProductDate", "Thu, 20 Oct 2016 09:52:32 GMT\0"
     END
 
   END
hg/stx-libwidg2