diff options
| author | Cody Russell <crussell@canonical.com> | 2010-07-29 16:07:05 -0500 |
|---|---|---|
| committer | Cody Russell <crussell@canonical.com> | 2010-07-29 16:07:05 -0500 |
| commit | b35ee3e7db326ae711af284a59faf31915e45b35 (patch) | |
| tree | dc7fe3561b004ee5869153febeb0295591fbd806 | |
| parent | ee58467ed38a7a1a5537d4ea9c1fe04b2ae24289 (diff) | |
| download | ayatana-ido-b35ee3e7db326ae711af284a59faf31915e45b35.tar.gz ayatana-ido-b35ee3e7db326ae711af284a59faf31915e45b35.tar.bz2 ayatana-ido-b35ee3e7db326ae711af284a59faf31915e45b35.zip | |
bleh
| -rw-r--r-- | gtk-doc.make | 14 | ||||
| -rw-r--r-- | src/idocalendarmenuitem.c | 8 | ||||
| -rw-r--r-- | src/idoentrymenuitem.c | 8 | ||||
| -rw-r--r-- | src/idoscalemenuitem.c | 4 |
4 files changed, 8 insertions, 26 deletions
diff --git a/gtk-doc.make b/gtk-doc.make index 57fab98..63adaed 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -75,11 +75,8 @@ $(REPORT_FILES): sgml-build.stamp scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @echo 'gtk-doc: Scanning header files' @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + @cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ else \ @@ -112,11 +109,8 @@ $(srcdir)/tmpl/*.sgml: sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) @echo 'gtk-doc: Building XML' @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + @cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) @touch sgml-build.stamp sgml.stamp: sgml-build.stamp diff --git a/src/idocalendarmenuitem.c b/src/idocalendarmenuitem.c index 9ad68bb..fca4bb6 100644 --- a/src/idocalendarmenuitem.c +++ b/src/idocalendarmenuitem.c @@ -121,13 +121,7 @@ ido_calendar_menu_item_send_focus_change (GtkWidget *widget, g_object_ref (widget); if (in) - { - GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS); - } - else - { - GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS); - } + gtk_widget_grab_focus (widget); event->focus_change.type = GDK_FOCUS_CHANGE; event->focus_change.window = g_object_ref (widget->window); diff --git a/src/idoentrymenuitem.c b/src/idoentrymenuitem.c index 7227201..251d108 100644 --- a/src/idoentrymenuitem.c +++ b/src/idoentrymenuitem.c @@ -174,13 +174,7 @@ ido_entry_menu_item_send_focus_change (GtkWidget *widget, g_object_ref (widget); if (in) - { - GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS); - } - else - { - GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS); - } + gtk_widget_grab_focus (widget); event->focus_change.type = GDK_FOCUS_CHANGE; event->focus_change.window = g_object_ref (widget->window); diff --git a/src/idoscalemenuitem.c b/src/idoscalemenuitem.c index 247fb43..4ec4baa 100644 --- a/src/idoscalemenuitem.c +++ b/src/idoscalemenuitem.c @@ -468,12 +468,12 @@ ido_scale_menu_item_button_press_event (GtkWidget *menuitem, translate_event_coordinates (menuitem, event->x_root, &x); event->x_root = x; - GTK_OBJECT_FLAGS (scale) |= GTK_HAS_GRAB; + ubuntu_gtk_widget_set_has_grab (scale, TRUE); gtk_widget_event (scale, ((GdkEvent *)(void*)(event))); - GTK_OBJECT_FLAGS (scale) &= ~(GTK_HAS_GRAB); + ubuntu_gtk_widget_set_has_grab (scale, FALSE); if (!priv->grabbed) { |