Mercurial Mercurial > hg > stx-libwidg / 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
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 29 Oct 2015 06:55:42 +0000
branchjv
changeset 5503 daccdb3507d3
parent 5502 e2537ebab282 (current diff)
parent 5501 0a89afd84c8f (diff)
child 5505 f1873e306ba5
Merge
EditTextView.st file | annotate | diff | comparison | revisions
Make.proto file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
libInit.cc file | annotate | diff | comparison | revisions
libwidg.rc file | annotate | diff | comparison | revisions
stx_libwidg.st file | annotate | diff | comparison | revisions 
--- a/EditTextView.st	Tue Oct 20 09:16:30 2015 +0100
+++ b/EditTextView.st	Thu Oct 29 06:55:42 2015 +0000
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
               All Rights Reserved
@@ -4133,6 +4131,8 @@
                 cursorCol := startCol.
             ] ifFalse:[
                 cursorCol := cursorCol - (endCol - startCol + 1).
+                "/ self assert:(cursorCol >= 0).
+                cursorCol := cursorCol max:1.
             ]
         ].
     ].
--- a/Make.proto	Tue Oct 20 09:16:30 2015 +0100
+++ b/Make.proto	Thu Oct 29 06:55:42 2015 +0000
@@ -190,6 +190,7 @@
 $(OUTDIR)EditField.$(O) EditField.$(H): EditField.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/libwidg/EditTextView.$(H) $(INCLUDE_TOP)/stx/libwidg/ListView.$(H) $(INCLUDE_TOP)/stx/libwidg/TextView.$(H) $(STCHDR)
 $(OUTDIR)FileSelectionBox.$(O) FileSelectionBox.$(H): FileSelectionBox.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/ModalBox.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/StandardSystemView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libwidg/DialogBox.$(H) $(INCLUDE_TOP)/stx/libwidg/EnterBox.$(H) $(INCLUDE_TOP)/stx/libwidg/ListSelectionBox.$(H) $(STCHDR)
 $(OUTDIR)RadioButton.$(O) RadioButton.$(H): RadioButton.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/libwidg/Button.$(H) $(INCLUDE_TOP)/stx/libwidg/Label.$(H) $(INCLUDE_TOP)/stx/libwidg/Toggle.$(H) $(STCHDR)
+$(OUTDIR)MacOSX2ToolbarIconLibrary.$(O) MacOSX2ToolbarIconLibrary.$(H): MacOSX2ToolbarIconLibrary.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libwidg/MacOSXToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libwidg/XPToolbarIconLibrary.$(H) $(STCHDR)
 $(OUTDIR)TextCollector.$(O) TextCollector.$(H): TextCollector.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/libwidg/EditTextView.$(H) $(INCLUDE_TOP)/stx/libwidg/ListView.$(H) $(INCLUDE_TOP)/stx/libwidg/TextView.$(H) $(STCHDR)
 $(OUTDIR)Windows8ToolbarIconLibrary.$(O) Windows8ToolbarIconLibrary.$(H): Windows8ToolbarIconLibrary.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libwidg/VistaToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libwidg/XPToolbarIconLibrary.$(H) $(STCHDR)
 $(OUTDIR)YesNoBox.$(O) YesNoBox.$(H): YesNoBox.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/ModalBox.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/StandardSystemView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libwidg/DialogBox.$(H) $(INCLUDE_TOP)/stx/libwidg/InfoBox.$(H) $(INCLUDE_TOP)/stx/libwidg/WarningBox.$(H) $(STCHDR)
--- a/Make.spec	Tue Oct 20 09:16:30 2015 +0100
+++ b/Make.spec	Thu Oct 29 06:55:42 2015 +0000
@@ -116,6 +116,7 @@
 	ClickMenuView \
 	EditField \
 	FileSelectionBox \
+	MacOSX2ToolbarIconLibrary \
 	RadioButton \
 	TextCollector \
 	Windows8ToolbarIconLibrary \
@@ -193,6 +194,7 @@
     $(OUTDIR_SLASH)ClickMenuView.$(O) \
     $(OUTDIR_SLASH)EditField.$(O) \
     $(OUTDIR_SLASH)FileSelectionBox.$(O) \
+    $(OUTDIR_SLASH)MacOSX2ToolbarIconLibrary.$(O) \
     $(OUTDIR_SLASH)RadioButton.$(O) \
     $(OUTDIR_SLASH)TextCollector.$(O) \
     $(OUTDIR_SLASH)Windows8ToolbarIconLibrary.$(O) \
--- a/bc.mak	Tue Oct 20 09:16:30 2015 +0100
+++ b/bc.mak	Thu Oct 29 06:55:42 2015 +0000
@@ -140,6 +140,7 @@
 $(OUTDIR)EditField.$(O) EditField.$(H): EditField.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\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(STCHDR)
 $(OUTDIR)FileSelectionBox.$(O) FileSelectionBox.$(H): FileSelectionBox.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\ModalBox.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\StandardSystemView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg\DialogBox.$(H) $(INCLUDE_TOP)\stx\libwidg\EnterBox.$(H) $(INCLUDE_TOP)\stx\libwidg\ListSelectionBox.$(H) $(STCHDR)
 $(OUTDIR)RadioButton.$(O) RadioButton.$(H): RadioButton.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\libwidg\Button.$(H) $(INCLUDE_TOP)\stx\libwidg\Label.$(H) $(INCLUDE_TOP)\stx\libwidg\Toggle.$(H) $(STCHDR)
+$(OUTDIR)MacOSX2ToolbarIconLibrary.$(O) MacOSX2ToolbarIconLibrary.$(H): MacOSX2ToolbarIconLibrary.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libwidg\MacOSXToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libwidg\XPToolbarIconLibrary.$(H) $(STCHDR)
 $(OUTDIR)TextCollector.$(O) TextCollector.$(H): TextCollector.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\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(STCHDR)
 $(OUTDIR)Windows8ToolbarIconLibrary.$(O) Windows8ToolbarIconLibrary.$(H): Windows8ToolbarIconLibrary.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libwidg\VistaToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libwidg\XPToolbarIconLibrary.$(H) $(STCHDR)
 $(OUTDIR)YesNoBox.$(O) YesNoBox.$(H): YesNoBox.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\ModalBox.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\StandardSystemView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg\DialogBox.$(H) $(INCLUDE_TOP)\stx\libwidg\InfoBox.$(H) $(INCLUDE_TOP)\stx\libwidg\WarningBox.$(H) $(STCHDR)
--- a/libInit.cc	Tue Oct 20 09:16:30 2015 +0100
+++ b/libInit.cc	Thu Oct 29 06:55:42 2015 +0000
@@ -92,6 +92,7 @@
 _ClickMenuView_Init(pass,__pRT__,snd);
 _EditField_Init(pass,__pRT__,snd);
 _FileSelectionBox_Init(pass,__pRT__,snd);
+_MacOSX2ToolbarIconLibrary_Init(pass,__pRT__,snd);
 _RadioButton_Init(pass,__pRT__,snd);
 _TextCollector_Init(pass,__pRT__,snd);
 _Windows8ToolbarIconLibrary_Init(pass,__pRT__,snd);
--- a/libwidg.rc	Tue Oct 20 09:16:30 2015 +0100
+++ b/libwidg.rc	Thu Oct 29 06:55:42 2015 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libwidg.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1,43
+  FILEVERSION     6,2,1,45
   PRODUCTVERSION  6,2,5,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 Elementary Widgets (LIB)\0"
-      VALUE "FileVersion", "6.2.1.43\0"
+      VALUE "FileVersion", "6.2.1.45\0"
       VALUE "InternalName", "stx:libwidg\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.5.0\0"
-      VALUE "ProductDate", "Thu, 01 Oct 2015 06:56:59 GMT\0"
+      VALUE "ProductDate", "Wed, 28 Oct 2015 23:12:00 GMT\0"
     END
 
   END
--- a/stx_libwidg.st	Tue Oct 20 09:16:30 2015 +0100
+++ b/stx_libwidg.st	Thu Oct 29 06:55:42 2015 +0000
@@ -245,7 +245,7 @@
         ClickMenuView
         EditField
         FileSelectionBox
-        (MacOSX2ToolbarIconLibrary autoload)
+        MacOSX2ToolbarIconLibrary
         RadioButton
         TextCollector
         Windows8ToolbarIconLibrary
@@ -266,13 +266,6 @@
 
 !stx_libwidg class methodsFor:'description - project information'!
 
-applicationIconFileName
-    "Return the name (without suffix) of an icon-file (the app's icon); will be included in the rc-resource file"
-
-    ^ nil
-    "/ ^ self applicationName
-!
-
 companyName
     "Return a companyname which will appear in <lib>.rc"
hg/stx-libwidg