diff --git a/Graphics/UI/Gtk/General/Enums.chs b/Graphics/UI/Gtk/General/Enums.chs --- a/Graphics/UI/Gtk/General/Enums.chs +++ b/Graphics/UI/Gtk/General/Enums.chs @@ -257,7 +257,7 @@ -- * The 'Packing' parameter determines how the child behaves in the horizontal -- or vertical way in an 'Graphics.UI.Gtk.Layout.HBox' or -- 'Graphics.UI.Gtk.Layout.VBox', respectively. 'PackNatural' --- means the child is as big as it reqests. It will stay at the start of the +-- means the child is as big as it requests. It will stay at the start or -- end of a 'Graphics.UI.Gtk.Layout.Box' if there is more space available. -- All children packed with 'PackRepel' will be padded on both sides with -- additional space. 'PackGrow' will increase the size of a widget so that it diff --git a/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs b/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs --- a/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs +++ b/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs @@ -267,20 +267,17 @@ -- comboBoxSetModelText :: ComboBoxClass self => self -> IO (ListStore String) comboBoxSetModelText combo = do -#if GTK_CHECK_VERSION(2,24,0) + cellLayoutClear (toComboBox combo) store <- listStoreNew ([] :: [String]) comboBoxSetModel combo (Just store) +#if GTK_CHECK_VERSION(2,24,0) let colId = makeColumnIdString 0 customStoreSetColumn store colId id comboBoxSetEntryTextColumn (toComboBox combo) colId -#else - cellLayoutClear (toComboBox combo) - store <- listStoreNew ([] :: [String]) - comboBoxSetModel combo (Just store) +#endif ren <- cellRendererTextNew cellLayoutPackStart (toComboBox combo) ren True cellLayoutSetAttributes (toComboBox combo) ren store (\a -> [cellText := a]) -#endif objectSetAttribute comboQuark combo (Just store) return store diff --git a/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c b/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c --- a/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c +++ b/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c @@ -511,7 +511,8 @@ WHEN_DEBUG(g_debug("calling gtk2hs_store_iter_has_child\t(%p, %p)\n", tree_model, iter)); Gtk2HsStore *store = (Gtk2HsStore *) tree_model; g_return_val_if_fail (GTK2HS_IS_STORE (tree_model), FALSE); - g_return_val_if_fail (iter->stamp == store->stamp, FALSE); + /* don't check if iter->stamp == store->stamp; see the thread culminating in + * http://sourceforge.net/p/gtk2hs/mailman/message/31887332/ for details */ gboolean result = gtk2hs_store_iter_has_child_impl(store->impl, iter); WHEN_DEBUG(g_debug("return gtk2hs_store_iter_has_child\t=%s\n", result ? "TRUE" : "FALSE")); diff --git a/demo/actionMenu/ActionMenu.hs b/demo/actionMenu/ActionMenu.hs --- a/demo/actionMenu/ActionMenu.hs +++ b/demo/actionMenu/ActionMenu.hs @@ -88,7 +88,7 @@ uiManagerInsertActionGroup ui standardGroup 0 win <- windowNew - on win destroyEvent $ liftIO mainQuit >> return False + on win objectDestroy mainQuit on win sizeRequest $ return (Requisition 200 100) (Just menuBar) <- uiManagerGetWidget ui "/ui/menubar" (Just toolBar) <- uiManagerGetWidget ui "/ui/toolbar" diff --git a/demo/buttonbox/ButtonBox.hs b/demo/buttonbox/ButtonBox.hs --- a/demo/buttonbox/ButtonBox.hs +++ b/demo/buttonbox/ButtonBox.hs @@ -11,7 +11,7 @@ window <- windowNew -- Here we connect the "destroy" event to a signal handler. - on window destroyEvent $ liftIO mainQuit >> return False + on window objectDestroy mainQuit -- Sets the border width of the window. set window [ containerBorderWidth := 10 ] diff --git a/demo/gtkbuilder/GtkBuilderTest.hs b/demo/gtkbuilder/GtkBuilderTest.hs --- a/demo/gtkbuilder/GtkBuilderTest.hs +++ b/demo/gtkbuilder/GtkBuilderTest.hs @@ -16,7 +16,7 @@ -- Basic user interation on button buttonActivated $ putStrLn "button pressed!" - on window deleteEvent $ liftIO mainQuit >> return False + on window objectDestroy mainQuit -- Display the window widgetShowAll window diff --git a/demo/hello/World.hs b/demo/hello/World.hs --- a/demo/hello/World.hs +++ b/demo/hello/World.hs @@ -12,7 +12,7 @@ -- Here we connect the "destroy" event to a signal handler. -- This event occurs when we call widgetDestroy on the window -- or if the user closes the window. - on window destroyEvent $ liftIO mainQuit >> return False + on window objectDestroy mainQuit -- Sets the border width and tile of the window. Note that border width -- attribute is in 'Container' from which 'Window' is derived. set window [ containerBorderWidth := 10, windowTitle := "Hello World" ] diff --git a/demo/menu/MenuDemo.hs b/demo/menu/MenuDemo.hs --- a/demo/menu/MenuDemo.hs +++ b/demo/menu/MenuDemo.hs @@ -66,6 +66,6 @@ set window [ windowTitle := "Demo" , containerChild := menuBar ] - on window destroyEvent $ liftIO mainQuit >> return True + on window objectDestroy mainQuit widgetShowAll window mainGUI diff --git a/demo/notebook/Notebook.hs b/demo/notebook/Notebook.hs --- a/demo/notebook/Notebook.hs +++ b/demo/notebook/Notebook.hs @@ -66,7 +66,7 @@ -- Show window. window `containerAdd` notebook widgetShowAll window - on window deleteEvent $ liftIO mainQuit >> return False + on window objectDestroy mainQuit mainGUI -- | Create notebook tab. diff --git a/demo/treelist/ListDemo.hs b/demo/treelist/ListDemo.hs --- a/demo/treelist/ListDemo.hs +++ b/demo/treelist/ListDemo.hs @@ -12,7 +12,7 @@ initGUI win <- windowNew - on win deleteEvent $ liftIO mainQuit >> return False + on win objectDestroy mainQuit -- create a new list model model <- listStoreNew diff --git a/demo/treelist/TreeDemo.hs b/demo/treelist/TreeDemo.hs --- a/demo/treelist/TreeDemo.hs +++ b/demo/treelist/TreeDemo.hs @@ -12,7 +12,7 @@ initGUI win <- windowNew - on win deleteEvent $ liftIO mainQuit >> return False + on win objectDestroy mainQuit -- create a new tree model model <- storeImpl diff --git a/gtk.cabal b/gtk.cabal --- a/gtk.cabal +++ b/gtk.cabal @@ -1,5 +1,5 @@ Name: gtk -Version: 0.12.5.0 +Version: 0.12.5.1 License: LGPL-2.1 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team @@ -23,7 +23,7 @@ SetupWrapper.hs SetupMain.hs Gtk2HsSetup.hs marshal.list hierarchy.list - + x-Types-File: Graphics/UI/Gtk/Types.chs x-Types-ModName: Graphics.UI.Gtk.Types x-Types-Forward: *System.Glib.GObject Graphics.UI.Gtk.General.Threading @@ -32,56 +32,56 @@ Data-Dir: demo Data-Files: actionMenu/ActionMenu.hs actionMenu/Makefile - + buttonbox/ButtonBox.hs buttonbox/Makefile - + carsim/CarSim.hs carsim/Makefile - + concurrent/Makefile concurrent/Progress.hs concurrent/ProgressThreadedRTS.hs - + embedded/Embedded.hs embedded/Makefile embedded/MPlayer.hs embedded/Notes.txt embedded/Uzbl.hs - + fastdraw/FastDraw.hs fastdraw/Makefile - + filechooser/FileChooserDemo.glade filechooser/FileChooserDemo.hs filechooser/Makefile - + fonts/Fonts.hs fonts/Makefile - + graphic/Drawing.hs graphic/Makefile - + gtkbuilder/GtkBuilderTest.hs gtkbuilder/Makefile gtkbuilder/simple.ui - + hello/Makefile hello/World.hs - + inputmethod/Layout.hs inputmethod/Makefile - + menu/ComboDemo.hs menu/Makefile menu/MenuDemo.hs - + notebook/Notebook.hs notebook/Makefile - + statusicon/Makefile statusicon/StatusIcon.hs - + treelist/Completion.hs treelist/DirList.hs treelist/FilterDemo.hs @@ -96,19 +96,19 @@ treelist/TreeSort.hs treelist/TreeTest.glade treelist/TreeTest.hs - + treelist/resListDND/desktop.png treelist/resListDND/laptop.png treelist/resListDND/laptopSmall.png treelist/resListDND/printer.png treelist/resListDND/server.png treelist/resListDND/tower.png - + unicode/Arabic.hs unicode/Makefile - + demos.txt - + Source-Repository head type: git location: https://github.com/gtk2hs/gtk2hs @@ -373,7 +373,7 @@ if !flag(deprecated) cpp-options: -DDISABLE_DEPRECATED else - x-Types-Tag: deprecated + x-Types-Tag: deprecated if os(windows) cpp-options: -DWIN32 extra-libraries: kernel32