Menu
▾
▴
[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar Combo.chs.pp,1.7,1.8 ComboBox.chs.pp,1.10,1.11 ComboBoxEntry.chs.pp,1.7,1.8 Menu.chs.pp,1.9,1.10 MenuBar.chs.pp,1.1,1.2 MenuShell.chs.pp,1.2,1.3 MenuToolButton.chs.pp,1.2,1.3 ToggleToolButton.chs.pp,1.2,1.3 ToolButton.chs.pp,1.2,1.3 Toolbar.chs.pp,1.8,1.9
|
From: Duncan C. <dun...@us...> - 2005-08-25 01:16:25
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv987/gtk/Graphics/UI/Gtk/MenuComboToolbar Modified Files: Combo.chs.pp ComboBox.chs.pp ComboBoxEntry.chs.pp Menu.chs.pp MenuBar.chs.pp MenuShell.chs.pp MenuToolButton.chs.pp ToggleToolButton.chs.pp ToolButton.chs.pp Toolbar.chs.pp Log Message: Merge Gtk+ 2.8 updates. These are mostly documentation changes/additions and new functions. The code names of properties now use '-' as a word seperator by default rather than '_' (and using the right name saves some internal translation and allocation in glib). Index: ToggleToolButton.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar/ToggleToolButton.chs.pp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ToggleToolButton.chs.pp 7 May 2005 21:10:47 -0000 1.2 +++ ToggleToolButton.chs.pp 25 Aug 2005 01:16:15 -0000 1.3 @@ -66,7 +66,9 @@ toggleToolButtonGetActive, -- * Attributes +#if GTK_CHECK_VERSION(2,8,0) toggleToolButtonActive, +#endif -- * Signals onToolButtonToggled, @@ -137,13 +139,16 @@ -------------------- -- Attributes --- | \'active\' property. See 'toggleToolButtonGetActive' and --- 'toggleToolButtonSetActive' +#if GTK_CHECK_VERSION(2,8,0) +-- | If the toggle tool button should be pressed in or not. +-- +-- Default value: @False@ -- toggleToolButtonActive :: ToggleToolButtonClass self => Attr self Bool toggleToolButtonActive = newAttr toggleToolButtonGetActive toggleToolButtonSetActive +#endif -------------------- -- Signals Index: ToolButton.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolButton.chs.pp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ToolButton.chs.pp 7 May 2005 20:57:26 -0000 1.2 +++ ToolButton.chs.pp 25 Aug 2005 01:16:15 -0000 1.3 @@ -86,12 +86,19 @@ toolButtonGetIconWidget, toolButtonSetLabelWidget, toolButtonGetLabelWidget, +#if GTK_CHECK_VERSION(2,8,0) + toolButtonSetIconName, + toolButtonGetIconName, +#endif -- * Attributes toolButtonLabel, toolButtonUseUnderline, toolButtonLabelWidget, toolButtonStockId, +#if GTK_CHECK_VERSION(2,8,0) + toolButtonIconName, +#endif toolButtonIconWidget, -- * Signals @@ -270,6 +277,38 @@ {# call gtk_tool_button_get_label_widget #} (toToolButton self) +#if GTK_CHECK_VERSION(2,8,0) +-- | Sets the icon for the tool button from a named themed icon. See the docs +-- for 'IconTheme' for more details. The \"icon_name\" property only has an +-- effect if not overridden by the \"label\", \"icon_widget\" and \"stock_id\" +-- properties. +-- +-- * Available since Gtk+ version 2.8 +-- +toolButtonSetIconName :: ToolButtonClass self => self + -> String -- ^ @iconName@ - the name of the themed icon + -> IO () +toolButtonSetIconName self iconName = + withUTFString iconName $ \iconNamePtr -> + {# call gtk_tool_button_set_icon_name #} + (toToolButton self) + iconNamePtr + +-- | Returns the name of the themed icon for the tool button, see +-- 'toolButtonSetIconName'. +-- +-- * Available since Gtk+ version 2.8 +-- +toolButtonGetIconName :: ToolButtonClass self => self + -> IO String -- ^ returns the icon name or {@NULL@, FIXME: this should + -- probably be converted to a Maybe data type} if the tool button + -- has no themed icon +toolButtonGetIconName self = + {# call gtk_tool_button_get_icon_name #} + (toToolButton self) + >>= peekUTFString +#endif + -------------------- -- Attributes @@ -309,6 +348,19 @@ toolButtonGetStockId toolButtonSetStockId +#if GTK_CHECK_VERSION(2,8,0) +-- | The name of the themed icon displayed on the item. This property only has +-- an effect if not overridden by \"label\", \"icon_widget\" or \"stock_id\" +-- properties. +-- +-- Default value: "" +-- +toolButtonIconName :: ToolButtonClass self => Attr self String +toolButtonIconName = newAttr + toolButtonGetIconName + toolButtonSetIconName +#endif + -- | Icon widget to display in the item. -- toolButtonIconWidget :: (ToolButtonClass self, WidgetClass iconWidget) => ReadWriteAttr self (Maybe Widget) (Maybe iconWidget) Index: Menu.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Menu.chs.pp 3 Jul 2005 12:27:09 -0000 1.9 +++ Menu.chs.pp 25 Aug 2005 01:16:15 -0000 1.10 @@ -100,7 +100,9 @@ #endif -- * Attributes +#if GTK_CHECK_VERSION(2,6,0) menuTearoffState, +#endif menuAccelGroup, menuActive, menuTitle, @@ -119,6 +121,7 @@ import System.Glib.UTFString import System.Glib.GList import System.Glib.Attributes +import System.Glib.Properties import System.Glib.GObject (makeNewGObject) import Graphics.UI.Gtk.Abstract.Object (makeNewObject) {#import Graphics.UI.Gtk.Types#} @@ -406,12 +409,24 @@ -------------------- -- Attributes --- | +-- | A title that may be displayed by the window manager when this menu is +-- torn-off. +-- +-- Default value: \"\" +-- +menuTearoffTitle :: MenuClass self => Attr self String +menuTearoffTitle = newAttrFromStringProperty "tearoff-title" + +#if GTK_CHECK_VERSION(2,6,0) +-- | A boolean that indicates whether the menu is torn-off. +-- +-- Default value: @False@ -- menuTearoffState :: MenuClass self => Attr self Bool menuTearoffState = newAttr menuGetTearoffState menuSetTearoffState +#endif -- | \'accelGroup\' property. See 'menuGetAccelGroup' and 'menuSetAccelGroup' -- @@ -444,7 +459,7 @@ -- Default value: -1 -- menuChildLeftAttach :: (MenuClass self, WidgetClass child) => child -> Attr self Int -menuChildLeftAttach = newAttrFromContainerChildIntProperty "left_attach" +menuChildLeftAttach = newAttrFromContainerChildIntProperty "left-attach" -- | The column number to attach the right side of the child to. -- @@ -453,7 +468,7 @@ -- Default value: -1 -- menuChildRightAttach :: (MenuClass self, WidgetClass child) => child -> Attr self Int -menuChildRightAttach = newAttrFromContainerChildIntProperty "right_attach" +menuChildRightAttach = newAttrFromContainerChildIntProperty "right-attach" -- | The row number to attach the top of the child to. -- @@ -462,7 +477,7 @@ -- Default value: -1 -- menuChildTopAttach :: (MenuClass self, WidgetClass child) => child -> Attr self Int -menuChildTopAttach = newAttrFromContainerChildIntProperty "top_attach" +menuChildTopAttach = newAttrFromContainerChildIntProperty "top-attach" -- | The row number to attach the bottom of the child to. -- @@ -471,4 +486,4 @@ -- Default value: -1 -- menuChildBottomAttach :: (MenuClass self, WidgetClass child) => child -> Attr self Int -menuChildBottomAttach = newAttrFromContainerChildIntProperty "bottom_attach" +menuChildBottomAttach = newAttrFromContainerChildIntProperty "bottom-attach" Index: MenuBar.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuBar.chs.pp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MenuBar.chs.pp 24 Aug 2005 23:40:42 -0000 1.1 +++ MenuBar.chs.pp 25 Aug 2005 01:16:15 -0000 1.2 @@ -49,20 +49,38 @@ MenuBar, MenuBarClass, castToMenuBar, + PackDirection(..), -- * Constructors - menuBarNew + menuBarNew, + +-- * Methods +#if GTK_CHECK_VERSION(2,8,0) + menuBarSetPackDirection, + menuBarGetPackDirection, + menuBarSetChildPackDirection, + menuBarGetChildPackDirection, +#endif + +-- * Attributes +#if GTK_CHECK_VERSION(2,8,0) + menuBarPackDirection, + menuBarChildPackDirection, +#endif ) where import Monad (liftM) import System.Glib.FFI +import System.Glib.Attributes import Graphics.UI.Gtk.Abstract.Object (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} {# context lib="gtk" prefix="gtk" #} +{# enum PackDirection {underscoreToCase} #} + -------------------- -- Constructors @@ -73,3 +91,81 @@ makeNewObject mkMenuBar $ liftM (castPtr :: Ptr Widget -> Ptr MenuBar) $ {# call unsafe menu_bar_new #} + +-------------------- +-- Methods + +#if GTK_CHECK_VERSION(2,8,0) +-- | Sets how items should be packed inside a menubar. +-- +-- * Available since Gtk+ version 2.8 +-- +menuBarSetPackDirection :: MenuBarClass self => self + -> PackDirection -- ^ @packDir@ - a new 'PackDirection'. + -> IO () +menuBarSetPackDirection self packDir = + {# call gtk_menu_bar_set_pack_direction #} + (toMenuBar self) + ((fromIntegral . fromEnum) packDir) + +-- | Retrieves the current pack direction of the menubar. See +-- 'menuBarSetPackDirection'. +-- +-- * Available since Gtk+ version 2.8 +-- +menuBarGetPackDirection :: MenuBarClass self => self + -> IO PackDirection -- ^ returns the pack direction +menuBarGetPackDirection self = + liftM (toEnum . fromIntegral) $ + {# call gtk_menu_bar_get_pack_direction #} + (toMenuBar self) + +-- | Sets how widgets should be packed inside the children of a menubar. +-- +-- * Available since Gtk+ version 2.8 +-- +menuBarSetChildPackDirection :: MenuBarClass self => self + -> PackDirection -- ^ @childPackDir@ - a new 'PackDirection'. + -> IO () +menuBarSetChildPackDirection self childPackDir = + {# call gtk_menu_bar_set_child_pack_direction #} + (toMenuBar self) + ((fromIntegral . fromEnum) childPackDir) + +-- | Retrieves the current child pack direction of the menubar. See +-- 'menuBarSetChildPackDirection'. +-- +-- * Available since Gtk+ version 2.8 +-- +menuBarGetChildPackDirection :: MenuBarClass self => self + -> IO PackDirection -- ^ returns the child pack direction +menuBarGetChildPackDirection self = + liftM (toEnum . fromIntegral) $ + {# call gtk_menu_bar_get_child_pack_direction #} + (toMenuBar self) +#endif + +-------------------- +-- Attributes + +#if GTK_CHECK_VERSION(2,8,0) +-- | The pack direction of the menubar. It determines how menuitems are +-- arranged in the menubar. +-- +-- Default value: 'PackDirectionLtr' +-- +menuBarPackDirection :: MenuBarClass self => Attr self PackDirection +menuBarPackDirection = newAttr + menuBarGetPackDirection + menuBarSetPackDirection + +-- | The pack direction of the menubar. It determines how the widgets +-- contained in child menuitems are arranged. +-- +-- Default value: 'PackDirectionLtr' +-- +menuBarChildPackDirection :: MenuBarClass self => Attr self PackDirection +menuBarChildPackDirection = newAttr + menuBarGetChildPackDirection + menuBarSetChildPackDirection +#endif Index: Combo.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs.pp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Combo.chs.pp 7 May 2005 20:57:26 -0000 1.7 +++ Combo.chs.pp 25 Aug 2005 01:16:15 -0000 1.8 @@ -203,33 +203,33 @@ -- Default value: @True@ -- comboEnableArrowKeys :: ComboClass self => Attr self Bool -comboEnableArrowKeys = newAttrFromBoolProperty "enable_arrow_keys" +comboEnableArrowKeys = newAttrFromBoolProperty "enable-arrow-keys" -- | Obsolete property, ignored. -- -- Default value: @True@ -- comboEnableArrowsAlways :: ComboClass self => Attr self Bool -comboEnableArrowsAlways = newAttrFromBoolProperty "enable_arrows_always" +comboEnableArrowsAlways = newAttrFromBoolProperty "enable-arrows-always" -- | Whether list item matching is case sensitive. -- -- Default value: @False@ -- comboCaseSensitive :: ComboClass self => Attr self Bool -comboCaseSensitive = newAttrFromBoolProperty "case_sensitive" +comboCaseSensitive = newAttrFromBoolProperty "case-sensitive" -- | Whether an empty value may be entered in this field. -- -- Default value: @True@ -- comboAllowEmpty :: ComboClass self => Attr self Bool -comboAllowEmpty = newAttrFromBoolProperty "allow_empty" +comboAllowEmpty = newAttrFromBoolProperty "allow-empty" -- | Whether entered values must already be present in the list. -- -- Default value: @False@ -- comboValueInList :: ComboClass self => Attr self Bool -comboValueInList = newAttrFromBoolProperty "value_in_list" +comboValueInList = newAttrFromBoolProperty "value-in-list" #endif Index: Toolbar.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs.pp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Toolbar.chs.pp 3 Jul 2005 12:27:09 -0000 1.8 +++ Toolbar.chs.pp 25 Aug 2005 01:16:15 -0000 1.9 @@ -138,8 +138,10 @@ #if GTK_CHECK_VERSION(2,4,0) toolbarShowArrow, #endif - toolbarStyle, +#if GTK_CHECK_VERSION(2,8,0) toolbarTooltips, +#endif + toolbarStyle, -- * Child Attributes toolbarChildExpand, @@ -558,15 +560,15 @@ {# call unsafe toolbar_get_n_items #} (toToolbar self) --- | Returns the @n@'th item on toolbar, or @Nothing@ if the toolbar does not +-- | Returns the @n@\'th item on toolbar, or @Nothing@ if the toolbar does not -- contain an @n@'th item. -- --- * Available since Gtk version 2.4 +-- * Available since Gtk+ version 2.4 -- toolbarGetNthItem :: ToolbarClass self => self -> Int -- ^ @n@ - A position on the toolbar -> IO (Maybe ToolItem) -- ^ returns The @n@'th 'ToolItem' on the toolbar, or - -- @Nothing@ if there isn't an @n@'th item. + -- @Nothing@ if there isn't an @n@\'th item. toolbarGetNthItem self n = maybeNull (makeNewObject mkToolItem) $ {# call unsafe toolbar_get_nth_item #} @@ -625,9 +627,9 @@ (fromBool showArrow) -- | Returns whether the toolbar has an overflow menu. See --- 'toolbarSetShowArrow' +-- 'toolbarSetShowArrow'. -- --- * Available since Gtk version 2.4 +-- * Available since Gtk+ version 2.4 -- toolbarGetShowArrow :: ToolbarClass self => self -> IO Bool toolbarGetShowArrow self = @@ -637,7 +639,7 @@ -- | Returns the relief style of buttons on the toolbar. See 'buttonSetRelief'. -- --- * Available since Gtk version 2.4 +-- * Available since Gtk+ version 2.4 -- toolbarGetReliefStyle :: ToolbarClass self => self -> IO ReliefStyle toolbarGetReliefStyle self = @@ -663,7 +665,7 @@ -- Default value: 'ToolbarIcons' -- toolbarToolbarStyle :: ToolbarClass self => Attr self ToolbarStyle -toolbarToolbarStyle = newAttrFromEnumProperty "toolbar_style" +toolbarToolbarStyle = newAttrFromEnumProperty "toolbar-style" #if GTK_CHECK_VERSION(2,4,0) -- | If an arrow should be shown if the toolbar doesn't fit. @@ -676,20 +678,22 @@ toolbarSetShowArrow #endif --- | \'style\' property. See 'toolbarGetStyle' and 'toolbarSetStyle' +-- | If the tooltips of the toolbar should be active or not. -- -toolbarStyle :: ToolbarClass self => Attr self ToolbarStyle -toolbarStyle = newAttr - toolbarGetStyle - toolbarSetStyle - --- | \'tooltips\' property. See 'toolbarGetTooltips' and 'toolbarSetTooltips' +-- Default value: @True@ -- toolbarTooltips :: ToolbarClass self => Attr self Bool toolbarTooltips = newAttr toolbarGetTooltips toolbarSetTooltips +-- | \'style\' property. See 'toolbarGetStyle' and 'toolbarSetStyle' +-- +toolbarStyle :: ToolbarClass self => Attr self ToolbarStyle +toolbarStyle = newAttr + toolbarGetStyle + toolbarSetStyle + -------------------- -- Child Attributes Index: ComboBoxEntry.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs.pp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ComboBoxEntry.chs.pp 7 May 2005 20:57:26 -0000 1.7 +++ ComboBoxEntry.chs.pp 25 Aug 2005 01:16:15 -0000 1.8 @@ -38,7 +38,8 @@ -- -- In contrast to a 'ComboBox', the underlying model of a 'ComboBoxEntry' -- must always have a text column (see 'comboBoxEntrySetTextColumn'), and the --- entry will show the content of the text column in the selected row. +-- entry will show the content of the text column in the selected row. To get +-- the text from the entry, use 'comboBoxGetActiveText'. -- -- The convenience API to construct simple text-only 'ComboBox'es can also -- be used with 'ComboBoxEntry's which have been constructed with Index: MenuShell.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuShell.chs.pp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MenuShell.chs.pp 7 Apr 2005 00:34:49 -0000 1.2 +++ MenuShell.chs.pp 25 Aug 2005 01:16:15 -0000 1.3 @@ -68,6 +68,15 @@ #if GTK_CHECK_VERSION(2,4,0) menuShellCancel, #endif +#if GTK_CHECK_VERSION(2,8,0) + menuShellSetTakeFocus, + menuShellGetTakeFocus, +#endif + +-- * Attributes +#if GTK_CHECK_VERSION(2,8,0) + menuShellTakeFocus, +#endif -- * Signals onActivateCurrent, @@ -86,6 +95,7 @@ import Monad (liftM) import System.Glib.FFI +import System.Glib.Attributes import Graphics.UI.Gtk.Abstract.Object (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} @@ -198,6 +208,71 @@ (toMenuShell self) #endif +#if GTK_CHECK_VERSION(2,8,0) +-- | If @takeFocus@ is @True@ (the default) the menu shell will take the +-- keyboard focus so that it will receive all keyboard events which is needed +-- to enable keyboard navigation in menus. +-- +-- Setting @takeFocus@ to @False@ is useful only for special applications +-- like virtual keyboard implementations which should not take keyboard focus. +-- +-- The @takeFocus@ state of a menu or menu bar is automatically propagated +-- to submenus whenever a submenu is popped up, so you don't have to worry +-- about recursively setting it for your entire menu hierarchy. Only when +-- programmatically picking a submenu and popping it up manually, the +-- @takeFocus@ property of the submenu needs to be set explicitely. +-- +-- Note that setting it to @False@ has side-effects: +-- +-- If the focus is in some other app, it keeps the focus and keynav in the +-- menu doesn't work. Consequently, keynav on the menu will only work if the +-- focus is on some toplevel owned by the onscreen keyboard. +-- +-- To avoid confusing the user, menus with @takeFocus@ set to @False@ should +-- not display mnemonics or accelerators, since it cannot be guaranteed that +-- they will work. +-- +-- See also 'keyboardGrab' +-- +-- * Available since Gtk+ version 2.8 +-- +menuShellSetTakeFocus :: MenuShellClass self => self + -> Bool -- ^ @takeFocus@ - @True@ if the menu shell should take the keyboard + -- focus on popup. + -> IO () +menuShellSetTakeFocus self takeFocus = + {# call gtk_menu_shell_set_take_focus #} + (toMenuShell self) + (fromBool takeFocus) + +-- | Returns @True@ if the menu shell will take the keyboard focus on popup. +-- +-- * Available since Gtk+ version 2.8 +-- +menuShellGetTakeFocus :: MenuShellClass self => self + -> IO Bool -- ^ returns @True@ if the menu shell will take the keyboard focus + -- on popup. +menuShellGetTakeFocus self = + liftM toBool $ + {# call gtk_menu_shell_get_take_focus #} + (toMenuShell self) +#endif + +-------------------- +-- Attributes + +#if GTK_CHECK_VERSION(2,8,0) +-- | A boolean that determines whether the menu and its submenus grab the +-- keyboard focus. See 'menuShellSetTakeFocus' and 'menuShellGetTakeFocus'. +-- +-- Default value: @True@ +-- +menuShellTakeFocus :: MenuShellClass self => Attr self Bool +menuShellTakeFocus = newAttr + menuShellGetTakeFocus + menuShellSetTakeFocus +#endif + -------------------- -- Signals Index: MenuToolButton.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuToolButton.chs.pp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MenuToolButton.chs.pp 7 May 2005 20:57:26 -0000 1.2 +++ MenuToolButton.chs.pp 25 Aug 2005 01:16:15 -0000 1.3 @@ -36,7 +36,7 @@ -- dropdown menu. -- -- Use 'menuToolButtonNew' to create a new 'MenuToolButton'. Use --- 'toggleToolButtonNewFromStock' to create a new 'MenuToolButton' containing a +-- 'menuToolButtonNewFromStock' to create a new 'MenuToolButton' containing a -- stock item. -- * Class Hierarchy @@ -144,12 +144,14 @@ {# call gtk_menu_tool_button_get_menu #} (toMenuToolButton self) --- | +-- | Sets the 'Tooltips' object to be used for arrow button which pops up the +-- menu. See 'toolItemSetTooltip' for setting a tooltip on the whole +-- 'MenuToolButton'. -- menuToolButtonSetArrowTooltip :: MenuToolButtonClass self => self - -> Tooltips -- ^ @tooltips@ - -> String -- ^ @tipText@ - -> String -- ^ @tipPrivate@ + -> Tooltips -- ^ @tooltips@ - the 'Tooltips' object to be used + -> String -- ^ @tipText@ - text to be used as tooltip text for tool item + -> String -- ^ @tipPrivate@ - text to be used as private tooltip text -> IO () menuToolButtonSetArrowTooltip self tooltips tipText tipPrivate = withUTFString tipPrivate $ \tipPrivatePtr -> Index: ComboBox.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs.pp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ComboBox.chs.pp 21 May 2005 02:11:30 -0000 1.10 +++ ComboBox.chs.pp 25 Aug 2005 01:16:15 -0000 1.11 @@ -378,7 +378,7 @@ -- | Returns the currently active string in @comboBox@ or @Nothing@ if none is -- selected. Note that you can only use this function with combo boxes --- constructed with 'comboBoxNewText'. +-- constructed with 'comboBoxNewText' and with 'ComboBoxEntry's. -- -- * Available since Gtk+ version 2.6 -- @@ -492,14 +492,22 @@ comboBoxGetColumnSpanColumn comboBoxSetColumnSpanColumn --- | +-- | The add-tearoffs property controls whether generated menus have tearoff +-- menu items. +-- +-- Note that this only affects menu style combo boxes. +-- +-- Default value: @False@ -- comboBoxAddTearoffs :: ComboBoxClass self => Attr self Bool comboBoxAddTearoffs = newAttr comboBoxGetAddTearoffs comboBoxSetAddTearoffs --- | +-- | The has-frame property controls whether a frame is drawn around the +-- entry. +-- +-- Default value: @True@ -- comboBoxHasFrame :: ComboBoxClass self => Attr self Bool comboBoxHasFrame = newAttrFromBoolProperty "has-frame" |