diff options
author | Simon Schampijer <simon@schampijer.de> | 2011-08-10 12:19:13 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2011-08-12 08:38:11 (GMT) |
commit | 4018265f6cf26e5f0c6fcc9f07310444b8e5f85e (patch) | |
tree | bf14d9a1ad54cda299c6589dc057eef35bdfed18 /src/sugar/_sugarext.defs | |
parent | d0a493e5326cf9b4c5cd6470242fd25665fdf1ed (diff) |
Replace our custom entry widget with one based on gtk.Entry
Our custom entry widget, which was based on sexyicon, did
support placing an icon in the entry (e.g. the magnifier icon
for the search entry) and displaying progress in the case of
the url entry in Browse. Both is supported since GTK+ 2.16 in the
gtk.Entry.
The patch does keep the old API, that is why we can land it in
0.94 no change in the shell needed only a small change in Browse,
in a second step I would like to use the upstream API e.g.
's/set_icon_from_name/set_icon_from_icon_name'.
Signed-off-by: Simon Schampijer <simon@laptop.org>
Reviewed-by: Benjamin Berg <benzea@sugarlabs.org>
Diffstat (limited to 'src/sugar/_sugarext.defs')
-rw-r--r-- | src/sugar/_sugarext.defs | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/src/sugar/_sugarext.defs b/src/sugar/_sugarext.defs index e36034d..070fb5b 100644 --- a/src/sugar/_sugarext.defs +++ b/src/sugar/_sugarext.defs @@ -1,13 +1,6 @@ ;; -*- scheme -*- ; object definitions -(define-object AddressEntry - (in-module "Sugar") - (parent "GtkEntry") - (c-name "SugarAddressEntry") - (gtype-id "SUGAR_TYPE_ADDRESS_ENTRY") -) - (define-object KeyGrabber (in-module "Sugar") (parent "GObject") @@ -29,13 +22,6 @@ (gtype-id "SUGAR_TYPE_GRID") ) -(define-object IconEntry - (in-module "Sexy") - (parent "GtkEntry") - (c-name "SexyIconEntry") - (gtype-id "SEXY_TYPE_ICON_ENTRY") -) - (define-object SMClientXSMP (in-module "Egg") (parent "EggSMClient") @@ -71,18 +57,6 @@ (gtype-id "ACME_TYPE_VOLUME_ALSA") ) -;; Enumerations and flags ... - -(define-enum IconEntryPosition - (in-module "Sexy") - (c-name "SexyIconEntryPosition") - (gtype-id "SEXY_TYPE_ICON_ENTRY_POSITION") - (values - '("primary" "SEXY_ICON_ENTRY_PRIMARY") - '("secondary" "SEXY_ICON_ENTRY_SECONDARY") - ) -) - ;; From sugar-menu.h (define-method set_active @@ -184,63 +158,6 @@ ) ) -;; From sexy-icon-entry.h - -(define-function sexy_icon_entry_get_type - (c-name "sexy_icon_entry_get_type") - (return-type "GType") -) - -(define-function sexy_icon_entry_new - (c-name "sexy_icon_entry_new") - (is-constructor-of "SexyIconEntry") - (return-type "GtkWidget*") -) - -(define-method set_icon - (of-object "SexyIconEntry") - (c-name "sexy_icon_entry_set_icon") - (return-type "none") - (parameters - '("SexyIconEntryPosition" "position") - '("GtkImage*" "icon" (null-ok)) - ) -) - -(define-method set_icon_highlight - (of-object "SexyIconEntry") - (c-name "sexy_icon_entry_set_icon_highlight") - (return-type "none") - (parameters - '("SexyIconEntryPosition" "position") - '("gboolean" "highlight") - ) -) - -(define-method get_icon - (of-object "SexyIconEntry") - (c-name "sexy_icon_entry_get_icon") - (return-type "GtkImage*") - (parameters - '("SexyIconEntryPosition" "position") - ) -) - -(define-method get_icon_highlight - (of-object "SexyIconEntry") - (c-name "sexy_icon_entry_get_icon_highlight") - (return-type "gboolean") - (parameters - '("SexyIconEntryPosition" "position") - ) -) - -(define-method add_clear_button - (of-object "SexyIconEntry") - (c-name "sexy_icon_entry_add_clear_button") - (return-type "none") -) - ;; From eggsmclient.h (define-function egg_sm_client_get_type |