Menu
▾
▴
[Gtk2hs-commit] (main branch): Update all `Layout` modules to Gtk+ 2.18.3
|
From: Andy S. <And...@co...> - 2010-03-23 09:26:08
|
Tue Mar 23 05:13:30 EDT 2010 Andy Stewart <laz...@gm...>
* Update all `Layout` modules to Gtk+ 2.18.3
Ignore-this: 36c78aae320c3a4b3125e8a07dc6199
hunk ./ApiUpdateTodoList.txt 235
-*** TODO Alignment.chs.pp
-*** TODO AspectFrame.chs
-*** TODO Expander.chs.pp
-*** TODO Fixed.chs
-*** TODO HBox.chs
-*** TODO HButtonBox.chs
-*** TODO HPaned.chs
-*** TODO Layout.chs
+*** DONE Alignment.chs.pp
+*** DONE AspectFrame.chs
+*** DONE Expander.chs.pp
+*** DONE Fixed.chs
+*** DONE HBox.chs
+*** DONE HButtonBox.chs
+*** DONE HPaned.chs
+*** DONE Layout.chs
hunk ./ApiUpdateTodoList.txt 244
-*** TODO Table.chs
-*** TODO VBox.chs
-*** TODO VButtonBox.chs
-*** TODO VPaned.chs
+*** DONE Table.chs
+*** DONE VBox.chs
+*** DONE VButtonBox.chs
+*** DONE VPaned.chs
hunk ./gtk/Graphics/UI/Gtk/Layout/Alignment.chs.pp 8
--- Copyright (C) 1999-2005 Axel Simon
+-- Copyright (C) 1999-2009 Axel Simon
hunk ./gtk/Graphics/UI/Gtk/Layout/Alignment.chs.pp 28
+
hunk ./gtk/Graphics/UI/Gtk/Layout/Alignment.chs.pp 45
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/AspectFrame.chs 8
--- Copyright (C) 1999-2005 Axel Simon
+-- Copyright (C) 1999-2009 Axel Simon
hunk ./gtk/Graphics/UI/Gtk/Layout/AspectFrame.chs 28
+
hunk ./gtk/Graphics/UI/Gtk/Layout/AspectFrame.chs 38
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/Expander.chs.pp 8
--- Copyright (C) 2004-2005 Duncan Coutts
+-- Copyright (C) 2004-2009 Duncan Coutts
hunk ./gtk/Graphics/UI/Gtk/Layout/Expander.chs.pp 30
+
hunk ./gtk/Graphics/UI/Gtk/Layout/Expander.chs.pp 43
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/Expander.chs.pp 88
+ expanderActivate,
+
+-- * Deprecated
+#ifndef DISABLE_DEPRECATED
hunk ./gtk/Graphics/UI/Gtk/Layout/Expander.chs.pp 95
+#endif
hunk ./gtk/Graphics/UI/Gtk/Layout/Expander.chs.pp 325
+expanderActivate :: ExpanderClass self => Signal self (IO ())
+expanderActivate = Signal (connect_NONE__NONE "activate")
hunk ./gtk/Graphics/UI/Gtk/Layout/Expander.chs.pp 328
+--------------------
+-- Deprecated
+#ifndef DISABLE_DEPRECATED
hunk ./gtk/Graphics/UI/Gtk/Layout/Expander.chs.pp 337
+#endif
hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 8
--- Copyright (C) 2004-2005 Duncan Coutts
+-- Copyright (C) 2004-2009 Duncan Coutts
hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 28
+
hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 66
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/HBox.chs 8
--- Copyright (C) 1999-2005 Axel Simon
+-- Copyright (C) 1999-2009 Axel Simon
hunk ./gtk/Graphics/UI/Gtk/Layout/HBox.chs 28
+
hunk ./gtk/Graphics/UI/Gtk/Layout/HBox.chs 39
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/HButtonBox.chs 8
--- Copyright (C) 2004-2005 Matthew Walton
+-- Copyright (C) 2004-2009 Matthew Walton
hunk ./gtk/Graphics/UI/Gtk/Layout/HButtonBox.chs 28
+
hunk ./gtk/Graphics/UI/Gtk/Layout/HButtonBox.chs 55
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/HPaned.chs 8
--- Copyright (C) 1999-2005 Axel Simon
+-- Copyright (C) 1999-2009 Axel Simon
hunk ./gtk/Graphics/UI/Gtk/Layout/HPaned.chs 28
+
hunk ./gtk/Graphics/UI/Gtk/Layout/HPaned.chs 36
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/Layout.chs 78
+ adjustments,
+
+-- * Deprecated
hunk ./gtk/Graphics/UI/Gtk/Layout/Layout.chs 285
+adjustments :: LayoutClass self => Signal self (Adjustment -> Adjustment -> IO ())
+adjustments = Signal (connect_OBJECT_OBJECT__NONE "set-scroll-adjustments")
hunk ./gtk/Graphics/UI/Gtk/Layout/Layout.chs 288
+--------------------
+-- Deprecated
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 26
--- gtk_notebook_set_window_creation_hook
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 43
+
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 57
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 71
+ NotebookWindowCreation,
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 123
+
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 130
+ notebookSetWindowCreationHook,
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 166
+ changeCurrentPage,
+ createWindow,
+ notebookMoveFocusOut,
+ reorderTab,
+ selectPage,
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 183
-import Control.Monad (liftM)
+import Control.Monad (liftM, unless)
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 190
+import System.Glib.GError
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 203
+--------------------
+-- Types.
+-- | A function used by 'Notebook' when a detachable tab is dropped in the root window, it's used to
+-- create a window containing a notebook where the tab will be attached. This function will also be
+-- responsible of moving/resizing the window and adding the necessary properties to the notebook (i.e.:
+-- group-id)
+type NotebookWindowCreation = Widget -> Int -> Int -> Notebook
+
+{#pointer NotebookWindowCreationFunc#}
+
+foreign import ccall "wrapper" mkNotebookWindowCreationFunc ::
+ (Ptr Notebook -> Ptr Widget -> {#type glong#} -> {#type glong#} -> Ptr () -> IO (Ptr Notebook))
+ -> IO NotebookWindowCreationFunc
+
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 996
+-- | Installs a global function used to create a window when a detached tab is dropped in an empty area.
+-- [_$_]
+-- Since 2.10
+notebookSetWindowCreationHook :: [_$_]
+ Maybe NotebookWindowCreation
+ -> DestroyNotify [_$_]
+ -> IO ()
+notebookSetWindowCreationHook func destroy = do
+ funcPtr <- case func of
+ Just fc -> mkNotebookWindowCreationFunc $ \_ widgetPtr x y _ -> do
+ widget <- makeNewObject mkWidget (return widgetPtr)
+ return (unsafeForeignPtrToPtr $ unNotebook (fc widget (fromIntegral x) (fromIntegral y)))
+ Nothing -> return nullFunPtr
+ {#call notebook_set_window_creation_hook#} funcPtr nullPtr destroy
+ unless (funcPtr == nullFunPtr) $ freeHaskellFunPtr funcPtr
+
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 1260
+changeCurrentPage :: NotebookClass self => Signal self (Int -> IO Bool)
+changeCurrentPage = Signal (connect_INT__BOOL "change-current-page")
+ [_$_]
+-- | The 'createWindow' signal is emitted when a detachable tab is dropped on the root window.
+-- [_$_]
+-- A handler for this signal can create a window containing a notebook where the tab will be
+-- attached. It is also responsible for moving/ resizing the window and adding the necessary properties
+-- to the notebook (e.g. the 'groupId' ).
+-- [_$_]
+-- The default handler uses the global window creation hook, if one has been set with
+-- 'notebookSetWindowCreationHook'.
+createWindow :: NotebookClass self => Signal self (Widget -> Int -> Int -> IO Notebook)
+createWindow = Signal (connect_OBJECT_INT_INT__OBJECTPTR "create-window")
+
+-- | Emitted signal when move focus out.
+notebookMoveFocusOut :: NotebookClass self => Signal self (DirectionType -> IO ())
+notebookMoveFocusOut = Signal (connect_ENUM__NONE "move-focus-out")
+ [_$_]
+-- | Emitted signal when switch page.
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 1284
+-- | Emitted signal when reorder tab.
+reorderTab :: NotebookClass self => Signal self (DirectionType -> IO ())
+reorderTab = Signal (connect_ENUM__NONE "reorder-tab")
+
+-- | Emitted signal when select page.
+selectPage :: NotebookClass self => Signal self (Bool -> IO Bool)
+selectPage = Signal (connect_BOOL__BOOL "select-page")
+ [_$_]
+
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp 1332
+
+-- | Signal helper functions.
+connect_OBJECT_INT_INT__OBJECTPTR ::
+ (GObjectClass a', GObjectClass obj) => SignalName ->
+ ConnectAfter -> obj -> [_$_]
+ (a' -> Int -> Int -> IO Notebook) ->
+ IO (ConnectId obj)
+connect_OBJECT_INT_INT__OBJECTPTR signal after obj user =
+ connectGeneric signal after obj action
+ where action :: Ptr GObject -> Ptr GObject -> Int -> Int -> IO (Ptr Notebook)
+ action _ obj1 x y =
+ failOnGError $
+ makeNewGObject mkGObject (return obj1) >>= \obj1' ->
+ user (unsafeCastGObject obj1') x y >>= notebookToNotebookPtr
+
+-- | Internal helper function for convert.
+notebookToNotebookPtr :: NotebookClass self => self -> IO (Ptr Notebook)
+notebookToNotebookPtr notebook = return $ unsafeForeignPtrToPtr (unNotebook (toNotebook notebook))
hunk ./gtk/Graphics/UI/Gtk/Layout/Table.chs 8
--- Copyright (C) 1999-2005 Axel Simon
+-- Copyright (C) 1999-2009 Axel Simon
hunk ./gtk/Graphics/UI/Gtk/Layout/Table.chs 28
+
hunk ./gtk/Graphics/UI/Gtk/Layout/Table.chs 51
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/VBox.chs 8
--- Copyright (C) 1999-2005 Axel Simon
+-- Copyright (C) 1999-2009 Axel Simon
hunk ./gtk/Graphics/UI/Gtk/Layout/VBox.chs 28
+
hunk ./gtk/Graphics/UI/Gtk/Layout/VBox.chs 30
--- [_$_]
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/VBox.chs 39
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/VButtonBox.chs 8
--- Copyright (C) 2004-2005 Matthew Walton
+-- Copyright (C) 2004-2009 Matthew Walton
hunk ./gtk/Graphics/UI/Gtk/Layout/VButtonBox.chs 28
+
hunk ./gtk/Graphics/UI/Gtk/Layout/VButtonBox.chs 55
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/VPaned.chs 8
--- Copyright (C) 1999-2005 Axel Simon
+-- Copyright (C) 1999-2009 Axel Simon
hunk ./gtk/Graphics/UI/Gtk/Layout/VPaned.chs 28
+
hunk ./gtk/Graphics/UI/Gtk/Layout/VPaned.chs 30
--- [_$_]
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/VPaned.chs 36
+--
hunk ./gtk/Graphics/UI/Gtk/Layout/VPaned.chs 58
-
hunk ./tools/hierarchyGen/hierarchy.list 287
-
+[_^I_][_^I_][_$_]
|
