From: Duncan C. <dun...@us...> - 2005-05-08 03:22:00
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/ActionMenuToolbar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10265/gtk/Graphics/UI/Gtk/ActionMenuToolbar Modified Files: UIManager.chs.pp Log Message: Flags.hs: new module defining the Flags type class. Copied from Gdk.Enums module. Change class methods into ordinary functions and reimplement toFlags function so that it works. Tested with QuickCheck. Gdk/Enums.chs: remove Flags class definition and import System.Glib.Flags instead. Also, don't re-export Flags class and functions so other modules will explicitly import it. other gtk modules: import Flags from System.Glib.Flags rather than from Graphics.UI.Gtk.(General|Gdk).Enums module Glib/Attributes.hs: don't export Attr data constructor. Glib/Properties.chs: don't import Attr data constructor. Import flags from new Flags module and define objectGetPropertyFlags, objectSetPropertyFlags and newAttrFromFlagsProperty. Makefile.am: add new module and move Attributes compile flags to here rather than {-# OPTIONS #-} pragma in the module itself. Index: UIManager.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/ActionMenuToolbar/UIManager.chs.pp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- UIManager.chs.pp 7 May 2005 20:57:22 -0000 1.2 +++ UIManager.chs.pp 8 May 2005 03:21:14 -0000 1.3 @@ -242,6 +242,7 @@ import Monad (liftM) import System.Glib.FFI +import System.Glib.Flags (Flags, fromFlags) import System.Glib.UTFString import System.Glib.GList import System.Glib.GError @@ -250,7 +251,6 @@ import Graphics.UI.Gtk.Abstract.Object (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} -import Graphics.UI.Gtk.Gdk.Enums (Flags(..)) {# context lib="gtk" prefix="gtk" #} |