Index: GtkExtend/GtkAccelGroup.st =================================================================== --- GtkExtend/GtkAccelGroup.st (revision 191) +++ GtkExtend/GtkAccelGroup.st (working copy) @@ -4,8 +4,8 @@ GTK.GtkAccelGroup class extend [ | cAccKey cAccMod | - cAccKey := CInt value: 0. - cAccMod := CInt value: 0. + cAccKey := CInt gcValue: 0. + cAccMod := CInt gcValue: 0. GTK.Gtk acceleratorParse: accelerator acceleratorKey: cAccKey acceleratorMods: cAccMod. ^ {cAccKey value. cAccMod value} ] Index: GtkExtend/GtkListStore.st =================================================================== --- GtkExtend/GtkListStore.st (revision 191) +++ GtkExtend/GtkListStore.st (working copy) @@ -1,41 +1,5 @@ GTK.GtkListStore extend [ - at: aGtkTreeIter [ - - - | values | - aGtkTreeIter ifNil: [ ^ nil ]. - values := OrderedCollection new. - 0 to: self getNColumns - 1 do: [ :column | - values add: (self at: aGtkTreeIter column: column) ]. - ^ values - ] - - at: aGtkTreeIter column: anInteger [ - - - ^ self getOop: aGtkTreeIter column: anInteger - ] - - at: aGtkTreeIter column: anInteger put: anObject [ - - - self setOop: aGtkTreeIter column: anInteger value: anObject - ] - - at: aGtkTreeIter put: anArray [ - - - 1 to: anArray size do: [ :i | - self at: aGtkTreeIter column: i - 1 put: (anArray at: i) ] - ] - - at: aGtkTreeIter do: aBlock [ - - - (self at: aGtkTreeIter) do: aBlock - ] - appendItem: anArray [ Index: GtkExtend/GtkTreeStore.st =================================================================== --- GtkExtend/GtkTreeStore.st (revision 191) +++ GtkExtend/GtkTreeStore.st (working copy) @@ -1,41 +1,5 @@ GTK.GtkTreeStore extend [ - at: aGtkTreeIter [ - - - | values | - aGtkTreeIter ifNil: [ ^ nil ]. - values := OrderedCollection new. - 0 to: self getNColumns - 1 do: [ :column | - values add: (self at: aGtkTreeIter column: column) ]. - ^ values - ] - - at: aGtkTreeIter column: anInteger [ - - - ^ self getOop: aGtkTreeIter column: anInteger - ] - - at: aGtkTreeIter column: anInteger put: anObject [ - - - self setOop: aGtkTreeIter column: anInteger value: anObject - ] - - at: aGtkTreeIter put: anArray [ - - - 1 to: anArray size do: [ :i | - self at: aGtkTreeIter column: i - 1 put: (anArray at: i) ] - ] - - at: aGtkTreeIter do: aBlock [ - - - (self at: aGtkTreeIter) do: aBlock - ] - itersDo: aBlock iter: aGtkTreeIter [ Index: GtkExtend/GtkTreeModel.st =================================================================== --- GtkExtend/GtkTreeModel.st (revision 0) +++ GtkExtend/GtkTreeModel.st (revision 0) @@ -0,0 +1,66 @@ +GTK.GtkTreeModel extend [ + + at: aGtkTreeIter [ + + + | values | + aGtkTreeIter ifNil: [ ^ nil ]. + values := OrderedCollection new. + 0 to: self getNColumns - 1 do: [ :column | + values add: (self at: aGtkTreeIter column: column) ]. + ^ values + ] + + at: aGtkTreeIter column: anInteger [ + + + ^ self getOop: aGtkTreeIter column: anInteger + ] + + at: aGtkTreeIter column: anInteger put: anObject [ + + + self setOop: aGtkTreeIter column: anInteger value: anObject + ] + + at: aGtkTreeIter put: anArray [ + + + 1 to: anArray size do: [ :i | + self at: aGtkTreeIter column: i - 1 put: (anArray at: i) ] + ] + + at: aGtkTreeIter do: aBlock [ + + + (self at: aGtkTreeIter) do: aBlock + ] + + itersDo: aBlock iter: aGtkTreeIter [ + + + | childIter | + childIter := GTK.GtkTreeIter new. + aBlock value: aGtkTreeIter. + (self iterChildren: childIter parent: aGtkTreeIter) ifTrue: [ self itersDo: aBlock iter: childIter ]. + [ self iterNext: aGtkTreeIter ] whileTrue: [ + aBlock value: aGtkTreeIter. + (self iterChildren: childIter parent: aGtkTreeIter) ifTrue: [ self itersDo: aBlock iter: childIter ] ] + ] + + itersDo: aBlock [ + + + | iter child | + ((iter := self getIterFirst) isNil or: [ (self iterIsValid: iter) not ] ) ifTrue: [ ^ nil ]. + self itersDo: aBlock iter: iter + ] + + do: aBlock [ + + + self itersDo: [ :iter | + aBlock value: (self at: iter) value: iter ] + ] +] + Index: GtkExtend/GtkContainer.st =================================================================== --- GtkExtend/GtkContainer.st (revision 191) +++ GtkExtend/GtkContainer.st (working copy) @@ -14,7 +7,7 @@ GTK.GtkContainer extend [ parent := child := self. [ (child := parent getFocusChild) isNil not ] whileTrue: [ parent := child ]. - ^ aGtkWindow getFocus address = parent address + ^ aGtkWindow getFocus = parent ] ]