Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r32 - trunk

genelib
Discussion topic

Back to topic list

svn commit: r32 - trunk

Author lotec
Full name Jan Bogaerts
Date 2006-03-23 11:00:32 PST
Message Author: lotec
Date: Thu Mar 23 11:00:32 2006
New Revision: 32

Removed:
   trunk/Future.txt
Modified:
   trunk/Controls.gen
   trunk/Search.gen
   trunk/WUser32.gen
Log:
listbox still not compiling

Modified: trunk/Controls.gen
Url: http://genelib.tigri​s.org/source/browse/​genelib/trunk/Contro​ls.gen?view=diff​&rev=32&p1=trunk​/Controls.gen&r1​=31&p2=trunk/Con​trols.gen&r2=32
====================​====================​====================​==================
--- trunk/Controls.gen (original)
+++ trunk/Controls.gen Thu Mar 23 11:00:32 2006
@@ -1328,50 +1328,47 @@
           '<<' InsertItem(aItem: self.entity, aBefore: self.entity)
           '>>' Removeitem(aItem: self.entity)
           '->>' RemoveAllItems
- constructor Create(aOwner: sBaseListBox^) = Owner = aOwner;
+ constructor Create(aOwner: sListBox^) = Owner = aOwner;
 ;
 control sListBox =
  controlType 11
  VScroll true
  BorderStyle 7
  AdditionalStyles LBS_Notify
+ exp Sort
  prop ItemIndex: int read exp GetItemIndex: int write exp SetItemIndex(aValue: int) //which item is selected
       Items: sListBoxItems read var fItems: sListBoxItems.Create(self) //the list of items
       TopIndex: int read exp GetTopIndex: int write exp SetTopIndex(aValue: int) //Specifies the index number of the item that appears at the top of the list box.
       AutoRedraw: bool read exp GetAutoRedraw: bool write exp SetAutoRedraw(aValue: bool) //specifies if listbox is automatically redrawn when item is added or not
- prop Sorted: bool read var fSorted: bool write exp SetSorted(aValue: bool)
+ Sorted: bool read var fSorted: bool write exp SetSorted(aValue: bool)
  exp select(aStart: string) //selects the first item that begins with the given string
 ;
 
 
-exp sListBoxItems.SetSorted(aValue: bool)
+exp sListBoxItems.AddItem(aItem: sListBoxItems.entity)
+=
+ //need to take into account that it is sorted or not
+ [<-Owner <> nil->
+ [<-Owner.Sorted == true->
+ raise(Exception.Crea​te('ListBox: sorted add not yet implemented'))
+ <-->
+ //send a message to the parent window
+ ]
+ ]
+;
+
+exp sListBox.SetSorted(aValue: bool)
 =
    //check if we want it sorted or not, if so, call the sort function
    [<-aValue == true-> Sort]
    fSorted = aValue
 ;
 
-exp sListBoxItems.Sort
+exp sListBox.Sort
 =
     raise(Exception.Crea​te('listbox: Sort not yet implemented'))
 ;
 
-exp sListBoxItems.AddItem(aItem: sListBoxItems.entity)
-=
- //need to take into account that it is sorted or not
- [<-Sorted == true->
- raise(Exception.Crea​te('ListBox: sorted add not yet implemented'))
- <-->
- //send a message to the parent window
-
-
-
-
-
-
- ]
-;
-
 exp sListBoxItems.InsertItem(aItem: sListBoxItems.entity, aBefore: sListBoxItems.entity)
 =
    #AddWarning('still have to check if the insert operator overloader is also called ')

Deleted: /trunk/Future.txt
Url: http://genelib.tigri​s.org/source/browse/​genelib/trunk/Future​.txt?view=auto&r​ev=31

Modified: trunk/Search.gen
Url: http://genelib.tigri​s.org/source/browse/​genelib/trunk/Search​.gen?view=diff&r​ev=32&p1=trunk/S​earch.gen&r1=31​&p2=trunk/Search.​gen&r2=32
====================​====================​====================​==================
--- trunk/Search.gen (original)
+++ trunk/Search.gen Thu Mar 23 11:00:32 2006
@@ -47,7 +47,7 @@
      Value: TCHAR override = return(Data@(CurPos).entity);
      IsEOF: bool override = return(CurPos < 0 || CurPos >= Data.NrRecords);
      SetStart override = StartPos = CurPos;
- GetSelection: pointer override = return(Point.Create(\x = CurPos, y = StartPos)); //we need to inverse, cause the start was actually set at the end of the selection
+ GetSelection: pointer override //we need to inverse, cause the start was actually set at the end of the selection
  constructor create = ;
  destructor Destroy = ;
 ;
@@ -63,6 +63,12 @@
 ;
 
 //------------------​--------------------​--------------------​--------------------​--------------------​
+exp sStringSearchData.GetSelection: pointer
+=
+ iPoint: Point^
+ iPoint.Create(\x = CurPos, y = StartPos)
+ return(iPoint)
+;
 
 exp sStringSearch.SetPat​tern(aValue: string&)
 =

Modified: trunk/WUser32.gen
Url: http://genelib.tigri​s.org/source/browse/​genelib/trunk/WUser3​2.gen?view=diff&​rev=32&p1=trunk/​WUser32.gen&r1=3​1&p2=trunk/WUser​32.gen&r2=32
====================​====================​====================​==================
--- trunk/WUser32.gen (original)
+++ trunk/WUser32.gen Thu Mar 23 11:00:32 2006
@@ -1629,3 +1629,35 @@
  EM_GETIMESTATUS = 0x00D9
 ;
 
+//Listbox Styles
+const
+ LBS_NOTIFY = 0x0001
+ LBS_SORT = 0x0002
+ LBS_NOREDRAW = 0x0004
+ LBS_MULTIPLESEL = 0x0008
+ LBS_OWNERDRAWFIXED = 0x0010
+ LBS_OWNERDRAWVARIABLE = 0x0020
+ LBS_HASSTRINGS = 0x0040
+ LBS_USETABSTOPS = 0x0080
+ LBS_NOINTEGRALHEIGHT = 0x0100
+ LBS_MULTICOLUMN = 0x0200
+ LBS_WANTKEYBOARDINPUT = 0x0400
+ LBS_EXTENDEDSEL = 0x0800
+ LBS_DISABLENOSCROLL = 0x1000
+ LBS_NODATA = 0x2000
+ LBS_NOSEL = 0x4000
+ LBS_COMBOBOX = 0x8000
+ LBS_STANDARD = LBS_NOTIFY | LBS_SORT | WS_VSCROLL | WS_BORDER
+;
+
+
+
+//Listbox Notification Codes
+const
+ LBN_ERRSPACE = -2
+ LBN_SELCHANGE = 1
+ LBN_DBLCLK = 2
+ LBN_SELCANCEL = 3
+ LBN_SETFOCUS = 4
+ LBN_KILLFOCUS = 5
+;

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r32 - trunk lotec Jan Bogaerts 2006-03-23 11:00:32 PST
Messages per page: