anjuta r4912 - in trunk: . libanjuta plugins/build-basic-autotools plugins/class-gen plugins/class-inheritance plugins/cvs-plugin plugins/debug-manager plugins/document-manager plugins/file-loader plugins/file-wizard plugins/gdb plugins/glade plugins/gtodo plugins/indent plugins/language-support-cpp-java plugins/macro plugins/message-view plugins/patch plugins/project-manager plugins/project-wizard plugins/run-program plugins/scintilla plugins/scintilla/scintilla plugins/scintilla/scintilla/include plugins/search plugins/sourceview plugins/symbol-db plugins/terminal plugins/tools plugins/valgrind src
- From: jhs svn gnome org
- To: svn-commits-list gnome org
- Subject: anjuta r4912 - in trunk: . libanjuta plugins/build-basic-autotools plugins/class-gen plugins/class-inheritance plugins/cvs-plugin plugins/debug-manager plugins/document-manager plugins/file-loader plugins/file-wizard plugins/gdb plugins/glade plugins/gtodo plugins/indent plugins/language-support-cpp-java plugins/macro plugins/message-view plugins/patch plugins/project-manager plugins/project-wizard plugins/run-program plugins/scintilla plugins/scintilla/scintilla plugins/scintilla/scintilla/include plugins/search plugins/sourceview plugins/symbol-db plugins/terminal plugins/tools plugins/valgrind src
- Date: Mon, 30 Mar 2009 21:45:20 +0000 (UTC)
Author: jhs
Date: Mon Mar 30 21:45:20 2009
New Revision: 4912
URL: http://svn.gnome.org/viewvc/anjuta?rev=4912&view=rev
Log:
2009-03-30 Johannes Schmid <jhs gnome org>
Patch from Maxim Ermilov <zaspire rambler ru>:
* configure.in:
* libanjuta/anjuta-launcher.c (create_password_dialog):
* libanjuta/anjuta-plugin.c (anjuta_plugin_class_init),
(anjuta_plugin_init):
* libanjuta/anjuta-preferences.c
(block_update_property_on_change_str),
(unblock_update_property_on_change_str):
* libanjuta/anjuta-preferences.h:
* libanjuta/anjuta-serializer.c:
* libanjuta/cell-renderer-captioned-image.h:
* libanjuta/e-splash.h:
* plugins/build-basic-autotools/plugin.c:
* plugins/class-gen/window.c:
* plugins/class-inheritance/class-inherit.h:
* plugins/class-inheritance/plugin.c:
* plugins/cvs-plugin/cvs-execute.c:
* plugins/debug-manager/breakpoints.c:
* plugins/debug-manager/data_view.c (dma_data_view_child_type):
* plugins/debug-manager/memory.c:
* plugins/debug-manager/plugin.c:
* plugins/debug-manager/sharedlib.c (sharedlibs_show),
(sharedlibs_hide):
* plugins/debug-manager/signals.c (create_signals_gui),
(signals_show), (signals_hide):
* plugins/debug-manager/stack_trace.c:
* plugins/debug-manager/start.c (add_source_show):
* plugins/debug-manager/threads.c:
* plugins/debug-manager/watch.c:
* plugins/document-manager/anjuta-bookmarks.c
(anjuta_bookmarks_init):
* plugins/document-manager/anjuta-docman.c:
* plugins/document-manager/plugin.c (activate_plugin):
* plugins/document-manager/search-box.c:
* plugins/file-loader/dnd.c:
* plugins/file-loader/dnd.h:
* plugins/file-loader/plugin.c (RowSeparatorFunc),
(open_with_dialog), (create_open_with_submenu):
* plugins/file-wizard/anjuta-file-wizard.glade:
* plugins/file-wizard/file.c (create_new_file_dialog),
(on_new_file_okbutton_clicked), (on_new_file_entry_changed),
(on_new_file_type_changed):
* plugins/file-wizard/file.h:
* plugins/gdb/debugger.c:
* plugins/gdb/plugin.c:
* plugins/gdb/utilities.c:
* plugins/gdb/utilities.h:
* plugins/glade/designer-associations-item.c
(associations_file_from_xml):
* plugins/glade/plugin.c (activate_plugin):
* plugins/gtodo/add_edit_item.c (RowSeparatorFunc),
(gui_add_todo_item), (add_edit_option_changed):
* plugins/gtodo/callback.c (category_changed), (purge_category):
* plugins/gtodo/export.c (export_gui):
* plugins/gtodo/interface.c (gtodo_update_settings),
(gui_create_todo_widget):
* plugins/gtodo/list_tooltip.c (get_tooltip_text):
* plugins/gtodo/main.h:
* plugins/gtodo/mcategory.c (category_manager):
* plugins/gtodo/tasklists.c (open_playlist), (create_playlist):
* plugins/gtodo/todo_db.c (RowSeparatorFunc), (read_categorys),
(load_category):
* plugins/indent/indent-dialog.c (indent_connect_items),
(on_indent_checkbutton_toggled),
(on_indent_spinbutton_value_changed), (create_dialog):
* plugins/language-support-cpp-java/plugin.c:
* plugins/macro/macro-actions.c (on_menu_insert_macro):
* plugins/macro/macro-util.c:
* plugins/message-view/anjuta-msgman.c (on_message_view_destroy),
(anjuta_msgman_append_view), (anjuta_msgman_remove_all_views):
* plugins/message-view/message-view.h:
* plugins/patch/patch-plugin.c (patch_show_gui):
* plugins/project-manager/gbf-project-model.h:
* plugins/project-manager/gbf-project-view.h:
* plugins/project-wizard/autogen.c:
* plugins/project-wizard/druid.c (cb_druid_add_property),
(npw_druid_new), (npw_druid_free):
* plugins/project-wizard/property.c:
* plugins/run-program/parameters.c (run_dialog_init):
* plugins/scintilla/anjuta-editor-scintilla.glade:
* plugins/scintilla/print.c:
* plugins/scintilla/scintilla/PlatGTK.cxx:
* plugins/scintilla/scintilla/ScintillaGTK.cxx:
* plugins/scintilla/scintilla/include/ScintillaWidget.h:
* plugins/scintilla/style-editor.c (on_hilite_style_entry_changed),
(sync_from_props), (sync_to_props), (create_style_editor_gui):
* plugins/scintilla/text-editor-iterable.c:
* plugins/scintilla/text_editor.c:
* plugins/scintilla/text_editor_cbs.c:
* plugins/scintilla/text_editor_cbs.h:
* plugins/search/plugin.c:
* plugins/search/plugin.h:
* plugins/search/search-replace.c:
* plugins/search/search-replace_backend.c:
* plugins/search/search-replace_backend.h:
* plugins/search/search_preferences.c:
* plugins/sourceview/anjuta-view.h:
* plugins/sourceview/assist-window.c (assist_window_init):
* plugins/symbol-db/symbol-db-engine-core.c:
* plugins/symbol-db/symbol-db-view-search.c (sdb_view_search_init):
* plugins/terminal/terminal.c:
* plugins/tools/dialog.c (atp_tool_dialog_show):
* plugins/tools/editor.c (atp_variable_dialog_show),
(atp_tool_editor_show):
* plugins/tools/execute.c:
* plugins/valgrind/vggeneralprefs.h:
* plugins/valgrind/vghelgrindprefs.c (menu_item_activated),
(show_last_access_new), (vg_helgrind_prefs_init):
* plugins/valgrind/vghelgrindprefs.h:
* plugins/valgrind/vgmemcheckprefs.c (menu_item_activated),
(combo_box_new), (vg_memcheck_prefs_init):
* plugins/valgrind/vgmemcheckprefs.h:
* plugins/valgrind/vgrule-editor.c (type_menu_changed),
(rule_type_menu_new), (call_stack_frame_new),
(vg_rule_editor_init), (vg_rule_editor_set_type),
(vg_rule_editor_get_rule):
* plugins/valgrind/vgrule-editor.h:
* plugins/valgrind/vgsearchbar.c (clear_clicked),
(vg_search_bar_init), (item_activate), (search_bar_set_menu_items):
* plugins/valgrind/vgsearchbar.h:
* src/about.c (on_about_plugin_activate):
* src/action-callbacks.h:
* src/anjuta-app.c (anjuta_app_add_widget_full):
* src/main.c (main):
* src/shell.c (on_shortcuts_activate),
(anjuta_test_shell_instance_init):
* src/start-with.c (on_application_wizard_clicked),
(on_import_wizard_clicked), (on_open_project_clicked),
(on_open_file_clicked), (on_new_file_clicked):
#572754 â Remove deprecated GTK+ symbols
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/libanjuta/anjuta-launcher.c
trunk/libanjuta/anjuta-plugin.c
trunk/libanjuta/anjuta-preferences.c
trunk/libanjuta/anjuta-preferences.h
trunk/libanjuta/anjuta-serializer.c
trunk/libanjuta/cell-renderer-captioned-image.h
trunk/libanjuta/e-splash.h
trunk/plugins/build-basic-autotools/plugin.c
trunk/plugins/class-gen/window.c
trunk/plugins/class-inheritance/class-inherit.h
trunk/plugins/class-inheritance/plugin.c
trunk/plugins/cvs-plugin/cvs-execute.c
trunk/plugins/debug-manager/breakpoints.c
trunk/plugins/debug-manager/data_view.c
trunk/plugins/debug-manager/memory.c
trunk/plugins/debug-manager/plugin.c
trunk/plugins/debug-manager/sharedlib.c
trunk/plugins/debug-manager/signals.c
trunk/plugins/debug-manager/stack_trace.c
trunk/plugins/debug-manager/start.c
trunk/plugins/debug-manager/threads.c
trunk/plugins/debug-manager/watch.c
trunk/plugins/document-manager/anjuta-bookmarks.c
trunk/plugins/document-manager/anjuta-docman.c
trunk/plugins/document-manager/plugin.c
trunk/plugins/document-manager/search-box.c
trunk/plugins/file-loader/dnd.c
trunk/plugins/file-loader/dnd.h
trunk/plugins/file-loader/plugin.c
trunk/plugins/file-wizard/anjuta-file-wizard.glade
trunk/plugins/file-wizard/file.c
trunk/plugins/file-wizard/file.h
trunk/plugins/gdb/debugger.c
trunk/plugins/gdb/plugin.c
trunk/plugins/gdb/utilities.c
trunk/plugins/gdb/utilities.h
trunk/plugins/glade/designer-associations-item.c
trunk/plugins/glade/plugin.c
trunk/plugins/gtodo/add_edit_item.c
trunk/plugins/gtodo/callback.c
trunk/plugins/gtodo/export.c
trunk/plugins/gtodo/interface.c
trunk/plugins/gtodo/list_tooltip.c
trunk/plugins/gtodo/main.h
trunk/plugins/gtodo/mcategory.c
trunk/plugins/gtodo/tasklists.c
trunk/plugins/gtodo/todo_db.c
trunk/plugins/indent/indent-dialog.c
trunk/plugins/language-support-cpp-java/plugin.c
trunk/plugins/macro/macro-actions.c
trunk/plugins/macro/macro-util.c
trunk/plugins/message-view/anjuta-msgman.c
trunk/plugins/message-view/message-view.h
trunk/plugins/patch/patch-plugin.c
trunk/plugins/project-manager/gbf-project-model.h
trunk/plugins/project-manager/gbf-project-view.h
trunk/plugins/project-wizard/autogen.c
trunk/plugins/project-wizard/druid.c
trunk/plugins/project-wizard/property.c
trunk/plugins/run-program/parameters.c
trunk/plugins/scintilla/anjuta-editor-scintilla.glade
trunk/plugins/scintilla/print.c
trunk/plugins/scintilla/scintilla/PlatGTK.cxx
trunk/plugins/scintilla/scintilla/ScintillaGTK.cxx
trunk/plugins/scintilla/scintilla/include/ScintillaWidget.h
trunk/plugins/scintilla/style-editor.c
trunk/plugins/scintilla/text-editor-iterable.c
trunk/plugins/scintilla/text_editor.c
trunk/plugins/scintilla/text_editor_cbs.c
trunk/plugins/scintilla/text_editor_cbs.h
trunk/plugins/search/plugin.c
trunk/plugins/search/plugin.h
trunk/plugins/search/search-replace.c
trunk/plugins/search/search-replace_backend.c
trunk/plugins/search/search-replace_backend.h
trunk/plugins/search/search_preferences.c
trunk/plugins/sourceview/anjuta-view.h
trunk/plugins/sourceview/assist-window.c
trunk/plugins/symbol-db/symbol-db-engine-core.c
trunk/plugins/symbol-db/symbol-db-view-search.c
trunk/plugins/terminal/terminal.c
trunk/plugins/tools/dialog.c
trunk/plugins/tools/editor.c
trunk/plugins/tools/execute.c
trunk/plugins/valgrind/vggeneralprefs.h
trunk/plugins/valgrind/vghelgrindprefs.c
trunk/plugins/valgrind/vghelgrindprefs.h
trunk/plugins/valgrind/vgmemcheckprefs.c
trunk/plugins/valgrind/vgmemcheckprefs.h
trunk/plugins/valgrind/vgrule-editor.c
trunk/plugins/valgrind/vgrule-editor.h
trunk/plugins/valgrind/vgsearchbar.c
trunk/plugins/valgrind/vgsearchbar.h
trunk/src/about.c
trunk/src/action-callbacks.h
trunk/src/anjuta-app.c
trunk/src/main.c
trunk/src/shell.c
trunk/src/start-with.c
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Mon Mar 30 21:45:20 2009
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
m4_define(anjuta_major_version, 2)
-m4_define(anjuta_minor_version, 26)
+m4_define(anjuta_minor_version, 27)
m4_define(anjuta_micro_version, 0)
m4_define(anjuta_nano_version, 0)
m4_define(anjuta_version, anjuta_major_version.anjuta_minor_version.anjuta_micro_version.anjuta_nano_version)
@@ -25,7 +25,7 @@
GLIB_REQUIRED=2.16.0
GDK_PIXBUF_REQUIRED=2.0.0
-GTK_REQUIRED=2.12.10
+GTK_REQUIRED=2.14.0
ORBIT_REQUIRED=2.6.0
LIBGLADE_REQUIRED=2.3.0
GNOME_REQUIRED=2.12.0
@@ -34,7 +34,7 @@
VTE_NEW_REQUIRED=0.13.1
LIBXML_REQUIRED=2.4.23
LIBDEVHELP_REQUIRED=0.22
-GDL_REQUIRED=2.26.0
+GDL_REQUIRED=2.24.0
GLADEUI_REQUIRED=3.6.0
LIBGRAPHVIZ_REQUIRED=1.0
NEON_REQUIRED=0.28.2
@@ -45,7 +45,7 @@
GTKSOURCEVIEW_REQUIRED=2.4.0
BINUTILS_REQUIRED=2.15.92
LIBWNCK_REQUIRED=2.12
-GDA_REQUIRED=3.99.7
+GDA_REQUIRED=4.0.0
UNIQUE_REQUIRED=1.0.0
dnl LIBGTODO_REQUIRED=0.15
Modified: trunk/libanjuta/anjuta-launcher.c
==============================================================================
--- trunk/libanjuta/anjuta-launcher.c (original)
+++ trunk/libanjuta/anjuta-launcher.c Mon Mar 30 21:45:20 2009
@@ -561,7 +561,7 @@
icon = anjuta_res_get_image (ANJUTA_PIXMAP_PASSWORD);
gtk_widget_show (icon);
- gtk_box_pack_start_defaults (GTK_BOX(hbox), icon);
+ gtk_box_pack_start (GTK_BOX(hbox), icon, TRUE, TRUE, 0);
if (strlen (prompt) < 20) {
box = gtk_hbox_new (FALSE, 5);
@@ -569,7 +569,7 @@
box = gtk_vbox_new (FALSE, 5);
}
gtk_widget_show (box);
- gtk_box_pack_start_defaults (GTK_BOX (hbox), box);
+ gtk_box_pack_start (GTK_BOX (hbox), box, TRUE, TRUE, 0);
label = gtk_label_new (_(prompt));
gtk_widget_show (label);
Modified: trunk/libanjuta/anjuta-plugin.c
==============================================================================
--- trunk/libanjuta/anjuta-plugin.c (original)
+++ trunk/libanjuta/anjuta-plugin.c Mon Mar 30 21:45:20 2009
@@ -214,7 +214,7 @@
static void anjuta_plugin_finalize (GObject *object);
static void anjuta_plugin_class_init (AnjutaPluginClass *class);
-GNOME_CLASS_BOILERPLATE (AnjutaPlugin, anjuta_plugin, GObject, G_TYPE_OBJECT);
+G_DEFINE_TYPE (AnjutaPlugin, anjuta_plugin, G_TYPE_OBJECT);
static void
destroy_watch (Watch *watch)
@@ -310,7 +310,7 @@
anjuta_plugin_class_init (AnjutaPluginClass *class)
{
GObjectClass *object_class = (GObjectClass*) class;
- parent_class = g_type_class_peek_parent (class);
+ GObjectClass *parent_class = g_type_class_peek_parent (class);
object_class->dispose = anjuta_plugin_dispose;
object_class->finalize = anjuta_plugin_finalize;
@@ -350,7 +350,7 @@
}
static void
-anjuta_plugin_instance_init (AnjutaPlugin *plugin)
+anjuta_plugin_init (AnjutaPlugin *plugin)
{
plugin->priv = g_new0 (AnjutaPluginPrivate, 1);
}
Modified: trunk/libanjuta/anjuta-preferences.c
==============================================================================
--- trunk/libanjuta/anjuta-preferences.c (original)
+++ trunk/libanjuta/anjuta-preferences.c Mon Mar 30 21:45:20 2009
@@ -64,6 +64,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
+#include <stdlib.h>
#include <glade/glade-parser.h>
#include <gconf/gconf-client.h>
@@ -911,7 +912,7 @@
{
AnjutaProperty *p = (AnjutaProperty *) user_data;
- gtk_signal_handler_block_by_func (GTK_OBJECT(p->object), G_CALLBACK (update_property_on_change_str), p);
+ g_signal_handlers_block_by_func (G_OBJECT(p->object), G_CALLBACK (update_property_on_change_str), p);
return FALSE;
}
@@ -921,7 +922,7 @@
{
AnjutaProperty *p = (AnjutaProperty *) user_data;
- gtk_signal_handler_unblock_by_func (GTK_OBJECT(p->object), G_CALLBACK (update_property_on_change_str), p);
+ g_signal_handlers_unblock_by_func (G_OBJECT(p->object), G_CALLBACK (update_property_on_change_str), p);
return FALSE;
}
Modified: trunk/libanjuta/anjuta-preferences.h
==============================================================================
--- trunk/libanjuta/anjuta-preferences.h (original)
+++ trunk/libanjuta/anjuta-preferences.h Mon Mar 30 21:45:20 2009
@@ -20,7 +20,9 @@
#ifndef _ANJUTA_PREFERENCES_H_
#define _ANJUTA_PREFERENCES_H_
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
#include <glade/glade.h>
#include <libanjuta/anjuta-preferences-dialog.h>
Modified: trunk/libanjuta/anjuta-serializer.c
==============================================================================
--- trunk/libanjuta/anjuta-serializer.c (original)
+++ trunk/libanjuta/anjuta-serializer.c Mon Mar 30 21:45:20 2009
@@ -28,6 +28,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include <anjuta-enum-types.h>
#include "anjuta-serializer.h"
Modified: trunk/libanjuta/cell-renderer-captioned-image.h
==============================================================================
--- trunk/libanjuta/cell-renderer-captioned-image.h (original)
+++ trunk/libanjuta/cell-renderer-captioned-image.h Mon Mar 30 21:45:20 2009
@@ -27,11 +27,11 @@
G_BEGIN_DECLS
#define ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE (anjuta_cell_renderer_captioned_image_get_type ())
-#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE(obj) (GTK_CHECK_CAST ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImage))
-#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImageClass))
-#define ANJUTA_IS_CELL_RENDERER_CAPTIONED_IMAGE(obj) (GTK_CHECK_TYPE ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
-#define ANJUTA_IS_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
-#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImageClass))
+#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImage))
+#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImageClass))
+#define ANJUTA_IS_CELL_RENDERER_CAPTIONED_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
+#define ANJUTA_IS_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
+#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImageClass))
typedef struct _AnjutaCellRendererCaptionedImage AnjutaCellRendererCaptionedImage;
typedef struct _AnjutaCellRendererCaptionedImageClass AnjutaCellRendererCaptionedImageClass;
Modified: trunk/libanjuta/e-splash.h
==============================================================================
--- trunk/libanjuta/e-splash.h (original)
+++ trunk/libanjuta/e-splash.h Mon Mar 30 21:45:20 2009
@@ -30,10 +30,10 @@
G_BEGIN_DECLS
#define E_TYPE_SPLASH (e_splash_get_type ())
-#define E_SPLASH(obj) (GTK_CHECK_CAST ((obj), E_TYPE_SPLASH, ESplash))
-#define E_SPLASH_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SPLASH, ESplashClass))
-#define E_IS_SPLASH(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_SPLASH))
-#define E_IS_SPLASH_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SPLASH))
+#define E_SPLASH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SPLASH, ESplash))
+#define E_SPLASH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SPLASH, ESplashClass))
+#define E_IS_SPLASH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SPLASH))
+#define E_IS_SPLASH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SPLASH))
typedef struct _ESplash ESplash;
typedef struct _ESplashPrivate ESplashPrivate;
@@ -49,7 +49,7 @@
GtkWindowClass parent_class;
};
-GtkType e_splash_get_type (void);
+GType e_splash_get_type (void);
void e_splash_construct (ESplash *splash,
GdkPixbuf *splash_image_pixbuf,
gint progressbar_position);
Modified: trunk/plugins/build-basic-autotools/plugin.c
==============================================================================
--- trunk/plugins/build-basic-autotools/plugin.c (original)
+++ trunk/plugins/build-basic-autotools/plugin.c Mon Mar 30 21:45:20 2009
@@ -20,6 +20,7 @@
#include <config.h>
#include <ctype.h>
+#include <stdlib.h>
#include <glib/gstdio.h>
#include <gio/gio.h>
Modified: trunk/plugins/class-gen/window.c
==============================================================================
--- trunk/plugins/class-gen/window.c (original)
+++ trunk/plugins/class-gen/window.c Mon Mar 30 21:45:20 2009
@@ -23,7 +23,7 @@
#include "element-editor.h"
#include <libanjuta/anjuta-plugin.h>
-
+#include <stdlib.h>
#include <glib.h>
#include <ctype.h>
Modified: trunk/plugins/class-inheritance/class-inherit.h
==============================================================================
--- trunk/plugins/class-inheritance/class-inherit.h (original)
+++ trunk/plugins/class-inheritance/class-inherit.h Mon Mar 30 21:45:20 2009
@@ -21,6 +21,7 @@
#define _CLASS_INHERIT_H
#include <libanjuta/interfaces/ianjuta-symbol-manager.h>
+#include <gnome.h>
#include "plugin.h"
Modified: trunk/plugins/class-inheritance/plugin.c
==============================================================================
--- trunk/plugins/class-inheritance/plugin.c (original)
+++ trunk/plugins/class-inheritance/plugin.c Mon Mar 30 21:45:20 2009
@@ -27,7 +27,7 @@
#include <libanjuta/interfaces/ianjuta-document-manager.h>
#include <libanjuta/interfaces/ianjuta-project-manager.h>
#include <libanjuta/anjuta-debug.h>
-
+#include <gnome.h>
#include "plugin.h"
#include "class-inherit.h"
Modified: trunk/plugins/cvs-plugin/cvs-execute.c
==============================================================================
--- trunk/plugins/cvs-plugin/cvs-execute.c (original)
+++ trunk/plugins/cvs-plugin/cvs-execute.c Mon Mar 30 21:45:20 2009
@@ -27,6 +27,7 @@
#include <libanjuta/anjuta-launcher.h>
#include <libanjuta/anjuta-debug.h>
+#include <unistd.h>
#include <glade/glade.h>
#define CVS_ICON ""
Modified: trunk/plugins/debug-manager/breakpoints.c
==============================================================================
--- trunk/plugins/debug-manager/breakpoints.c (original)
+++ trunk/plugins/debug-manager/breakpoints.c Mon Mar 30 21:45:20 2009
@@ -48,7 +48,8 @@
#include <unistd.h>
#include <string.h>
#include <ctype.h>
-
+#include <stdlib.h>
+#include <glib/gi18n.h>
#include <gio/gio.h>
#include <libanjuta/resources.h>
Modified: trunk/plugins/debug-manager/data_view.c
==============================================================================
--- trunk/plugins/debug-manager/data_view.c (original)
+++ trunk/plugins/debug-manager/data_view.c Mon Mar 30 21:45:20 2009
@@ -751,7 +751,7 @@
static GType
dma_data_view_child_type (GtkContainer *container)
{
- return GTK_TYPE_NONE;
+ return G_TYPE_NONE;
}
static void
Modified: trunk/plugins/debug-manager/memory.c
==============================================================================
--- trunk/plugins/debug-manager/memory.c (original)
+++ trunk/plugins/debug-manager/memory.c Mon Mar 30 21:45:20 2009
@@ -26,7 +26,9 @@
#include <unistd.h>
#include <string.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <gdk/gdk.h>
/*#define DEBUG*/
#include <libanjuta/anjuta-debug.h>
Modified: trunk/plugins/debug-manager/plugin.c
==============================================================================
--- trunk/plugins/debug-manager/plugin.c (original)
+++ trunk/plugins/debug-manager/plugin.c Mon Mar 30 21:45:20 2009
@@ -38,6 +38,7 @@
#include "queue.h"
#include "variable.h"
+#include <glib/gi18n.h>
#include <libanjuta/anjuta-shell.h>
#include <libanjuta/anjuta-debug.h>
#include <libanjuta/anjuta-status.h>
Modified: trunk/plugins/debug-manager/sharedlib.c
==============================================================================
--- trunk/plugins/debug-manager/sharedlib.c (original)
+++ trunk/plugins/debug-manager/sharedlib.c Mon Mar 30 21:45:20 2009
@@ -287,7 +287,7 @@
}
else
{
- gtk_widget_set_uposition(sl->widgets.window, sl->win_pos_x,
+ gdk_window_move(sl->widgets.window->window, sl->win_pos_x,
sl->win_pos_y);
gtk_window_set_default_size(GTK_WINDOW(sl->widgets.window),
sl->win_width, sl->win_height);
@@ -309,7 +309,7 @@
if(sl->is_showing == FALSE) return;
gdk_window_get_root_origin(sl->widgets.window->window,
&sl->win_pos_x, &sl->win_pos_y);
- gdk_window_get_size(sl ->widgets.window->window, &sl->win_width,
+ gdk_drawable_get_size(sl ->widgets.window->window, &sl->win_width,
&sl->win_height);
gtk_widget_hide(sl->widgets.window);
sl->is_showing = FALSE;
Modified: trunk/plugins/debug-manager/signals.c
==============================================================================
--- trunk/plugins/debug-manager/signals.c (original)
+++ trunk/plugins/debug-manager/signals.c Mon Mar 30 21:45:20 2009
@@ -26,6 +26,8 @@
#include <string.h>
#include <ctype.h>
+#include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
#include <libanjuta/anjuta-shell.h>
#include <libanjuta/resources.h>
@@ -363,10 +365,10 @@
tv = signals_create_list_store_and_treeview (sg);
gtk_widget_show (tv);
gtk_container_add (GTK_CONTAINER (scrolledwindow4), tv);
- gtk_signal_connect (GTK_OBJECT (window3), "delete_event",
- GTK_SIGNAL_FUNC (on_signals_delete_event),sg);
- gtk_signal_connect (GTK_OBJECT (window3), "key-press-event",
- GTK_SIGNAL_FUNC (on_signals_key_press_event), sg);
+ g_signal_connect (G_OBJECT (window3), "delete_event",
+ G_CALLBACK (on_signals_delete_event),sg);
+ g_signal_connect (G_OBJECT (window3), "key-press-event",
+ G_CALLBACK (on_signals_key_press_event), sg);
sg->widgets.window = window3;
sg->widgets.treeview = tv;
@@ -421,7 +423,7 @@
}
else
{
- gtk_widget_set_uposition (sg->widgets.window, sg->win_pos_x,
+ gdk_window_move (sg->widgets.window->window, sg->win_pos_x,
sg->win_pos_y);
gtk_window_set_default_size (GTK_WINDOW (sg->widgets.window),
sg->win_width, sg->win_height);
@@ -444,7 +446,7 @@
return;
gdk_window_get_root_origin (sg->widgets.window->window, &sg->win_pos_x,
&sg->win_pos_y);
- gdk_window_get_size (sg->widgets.window->window, &sg->win_width,
+ gdk_drawable_get_size (sg->widgets.window->window, &sg->win_width,
&sg->win_height);
gtk_widget_hide (sg->widgets.window);
sg->is_showing = FALSE;
Modified: trunk/plugins/debug-manager/stack_trace.c
==============================================================================
--- trunk/plugins/debug-manager/stack_trace.c (original)
+++ trunk/plugins/debug-manager/stack_trace.c Mon Mar 30 21:45:20 2009
@@ -27,7 +27,8 @@
#include <unistd.h>
#include <string.h>
#include <ctype.h>
-
+#include <stdlib.h>
+#include <glib/gi18n.h>
#include <gio/gio.h>
/*#define DEBUG*/
Modified: trunk/plugins/debug-manager/start.c
==============================================================================
--- trunk/plugins/debug-manager/start.c (original)
+++ trunk/plugins/debug-manager/start.c Mon Mar 30 21:45:20 2009
@@ -44,7 +44,8 @@
#include <glade/glade-xml.h>
#include <gio/gio.h>
-
+#include <glib/gi18n.h>
+#include <stdlib.h>
#include <errno.h>
#include <sys/stat.h>
#include <ctype.h>
@@ -1273,7 +1274,7 @@
gtk_tree_view_append_column (dlg.tree, column);
gtk_tree_view_set_expander_column(dlg.tree, column);
- dlg.model = gtk_list_store_new (1, GTK_TYPE_STRING);
+ dlg.model = gtk_list_store_new (1, G_TYPE_STRING);
gtk_tree_view_set_model (dlg.tree, GTK_TREE_MODEL (dlg.model));
gtk_window_set_transient_for (GTK_WINDOW (widget), parent);
Modified: trunk/plugins/debug-manager/threads.c
==============================================================================
--- trunk/plugins/debug-manager/threads.c (original)
+++ trunk/plugins/debug-manager/threads.c Mon Mar 30 21:45:20 2009
@@ -25,6 +25,7 @@
#include "queue.h"
+#include <stdlib.h>
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
Modified: trunk/plugins/debug-manager/watch.c
==============================================================================
--- trunk/plugins/debug-manager/watch.c (original)
+++ trunk/plugins/debug-manager/watch.c Mon Mar 30 21:45:20 2009
@@ -26,6 +26,7 @@
#include "utilities.h"
/*#define DEBUG*/
+#include <glib/gi18n.h>
#include <libanjuta/anjuta-debug.h>
#include <libanjuta/interfaces/ianjuta-editor-selection.h>
#include <libanjuta/interfaces/ianjuta-editor.h>
Modified: trunk/plugins/document-manager/anjuta-bookmarks.c
==============================================================================
--- trunk/plugins/document-manager/anjuta-bookmarks.c (original)
+++ trunk/plugins/document-manager/anjuta-bookmarks.c Mon Mar 30 21:45:20 2009
@@ -236,8 +236,8 @@
g_signal_connect (G_OBJECT(priv->button_remove), "clicked", G_CALLBACK(on_remove_clicked), bookmarks);
gtk_widget_set_sensitive (GTK_WIDGET(priv->button_add), FALSE);
gtk_widget_set_sensitive (GTK_WIDGET(priv->button_remove), FALSE);
- gtk_box_pack_start_defaults (GTK_BOX(button_box), priv->button_add);
- gtk_box_pack_start_defaults (GTK_BOX(button_box), priv->button_remove);
+ gtk_box_pack_start (GTK_BOX(button_box), priv->button_add, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX(button_box), priv->button_remove, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(priv->window),
button_box,
Modified: trunk/plugins/document-manager/anjuta-docman.c
==============================================================================
--- trunk/plugins/document-manager/anjuta-docman.c (original)
+++ trunk/plugins/document-manager/anjuta-docman.c Mon Mar 30 21:45:20 2009
@@ -29,6 +29,7 @@
#include <libanjuta/interfaces/ianjuta-editor.h>
#include <libanjuta/interfaces/ianjuta-editor-factory.h>
+#include <stdlib.h>
#include <gtk/gtk.h>
#include "anjuta-docman.h"
Modified: trunk/plugins/document-manager/plugin.c
==============================================================================
--- trunk/plugins/document-manager/plugin.c (original)
+++ trunk/plugins/document-manager/plugin.c Mon Mar 30 21:45:20 2009
@@ -1708,7 +1708,7 @@
dplugin->uiid = anjuta_ui_merge (ui, UI_FILE);
dplugin->vbox = gtk_vbox_new (FALSE, 0);
gtk_widget_show (dplugin->vbox);
- gtk_box_pack_start_defaults (GTK_BOX(dplugin->vbox), docman);
+ gtk_box_pack_start (GTK_BOX(dplugin->vbox), docman, TRUE, TRUE, 0);
anjuta_shell_add_widget_full (plugin->shell, dplugin->vbox,
"AnjutaDocumentManager", _("Documents"),
"editor-plugin-icon",
Modified: trunk/plugins/document-manager/search-box.c
==============================================================================
--- trunk/plugins/document-manager/search-box.c (original)
+++ trunk/plugins/document-manager/search-box.c Mon Mar 30 21:45:20 2009
@@ -25,6 +25,7 @@
#include <glib/gi18n.h>
#include "search-box.h"
+#include <stdlib.h>
#include <gtk/gtk.h>
#include <libanjuta/anjuta-shell.h>
Modified: trunk/plugins/file-loader/dnd.c
==============================================================================
--- trunk/plugins/file-loader/dnd.c (original)
+++ trunk/plugins/file-loader/dnd.c Mon Mar 30 21:45:20 2009
@@ -30,7 +30,9 @@
#endif
#include <stdarg.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <gdk/gdk.h>
#include "dnd.h"
Modified: trunk/plugins/file-loader/dnd.h
==============================================================================
--- trunk/plugins/file-loader/dnd.h (original)
+++ trunk/plugins/file-loader/dnd.h Mon Mar 30 21:45:20 2009
@@ -23,7 +23,9 @@
* USA.
*/
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <gdk/gdk.h>
#ifndef _DND_H_
#define _DND_H_
Modified: trunk/plugins/file-loader/plugin.c
==============================================================================
--- trunk/plugins/file-loader/plugin.c (original)
+++ trunk/plugins/file-loader/plugin.c Mon Mar 30 21:45:20 2009
@@ -20,6 +20,8 @@
#include <config.h>
+#include <stdlib.h>
+#include <unistd.h>
#include <glib/gi18n.h>
#include <libanjuta/anjuta-shell.h>
@@ -190,19 +192,29 @@
return plugin_descs;
}
+static gboolean
+RowSeparatorFunc (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+ int n = GPOINTER_TO_INT(data), k;
+ gchar *path = gtk_tree_model_get_string_from_iter (model, iter);
+ sscanf (path, "%d", &k);
+ g_free (path);
+ return n == k;
+}
+
static void
open_with_dialog (AnjutaFileLoaderPlugin *plugin, const gchar *uri,
const gchar *mime_type)
{
GList *plugin_descs, *snode;
GList *mime_apps, *node;
- GtkWidget *menu, *menuitem;
GAppInfo *mime_app;
GtkWidget *dialog, *parent, *hbox, *label;
GtkWidget *options;
gchar *message;
gchar *basename;
+ gint col = -1;
AnjutaPluginManager *plugin_manager;
plugin_manager = anjuta_shell_get_plugin_manager (ANJUTA_PLUGIN (plugin)->shell,
@@ -232,15 +244,13 @@
gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->vbox), hbox,
FALSE, FALSE, 5);
label = gtk_label_new (_("Open with:"));
- options = gtk_option_menu_new ();
+ options = gtk_combo_box_new_text ();
gtk_box_pack_end (GTK_BOX(hbox), options, FALSE, FALSE, 10);
gtk_box_pack_end (GTK_BOX(hbox), label, FALSE, FALSE, 10);
- menu = gtk_menu_new ();
-
/* Document manager plugin */
- menuitem = gtk_menu_item_new_with_label (_("Document Manager"));
- gtk_menu_append (menu, menuitem);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (options), _("Document Manager"));
+ col ++;
/* Open with plugins menu items */
plugin_descs = get_available_plugins_for_mime (ANJUTA_PLUGIN (plugin), mime_type);
@@ -267,8 +277,8 @@
anjuta_plugin_description_get_string (desc, "Anjuta Plugin",
"Location", &name);
}
- menuitem = gtk_menu_item_new_with_label (name);
- gtk_menu_append (menu, menuitem);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (options), name);
+ col ++;
g_free (name);
snode = g_list_next (snode);
}
@@ -278,8 +288,9 @@
if (mime_apps)
{
/* Separator */
- menuitem = gtk_menu_item_new ();
- gtk_menu_append (menu, menuitem);
+ col++;
+ gtk_combo_box_append_text (GTK_COMBO_BOX (options), "");
+ gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (options), RowSeparatorFunc, GINT_TO_POINTER(col), NULL);
}
node = mime_apps;
while (node)
@@ -287,21 +298,18 @@
mime_app = (GAppInfo *)(node->data);
if (g_app_info_should_show (mime_app))
{
- menuitem = gtk_menu_item_new_with_label (
- g_app_info_get_name (mime_app));
- gtk_menu_append (menu, menuitem);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (options), g_app_info_get_name (mime_app));
}
node = g_list_next (node);
}
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (options), menu);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (options), 0);
gtk_widget_show_all (hbox);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
{
gint option;
- option = gtk_option_menu_get_history(GTK_OPTION_MENU (options));
+ option = gtk_combo_box_get_active(GTK_COMBO_BOX (options));
if (option == 0)
{
IAnjutaDocumentManager *docman;
@@ -935,7 +943,7 @@
g_object_set_data (G_OBJECT (menuitem), "mime_type", mime_type);
g_signal_connect (G_OBJECT (menuitem), "activate",
G_CALLBACK (callback), callback_data);
- gtk_menu_append (menu, menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
g_free (name);
}
g_list_free (plugin_descs);
@@ -945,7 +953,7 @@
if (plugin_descs && mime_apps)
{
menuitem = gtk_menu_item_new ();
- gtk_menu_append (menu, menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
}
for (node = mime_apps; node != NULL; node = g_list_next (node))
@@ -960,7 +968,7 @@
g_object_set_data (G_OBJECT (menuitem), "mime_type", mime_type);
g_signal_connect (G_OBJECT (menuitem), "activate",
G_CALLBACK (callback), callback_data);
- gtk_menu_append (menu, menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
}
else
{
Modified: trunk/plugins/file-wizard/anjuta-file-wizard.glade
==============================================================================
--- trunk/plugins/file-wizard/anjuta-file-wizard.glade (original)
+++ trunk/plugins/file-wizard/anjuta-file-wizard.glade Mon Mar 30 21:45:20 2009
@@ -105,10 +105,10 @@
</packing>
</child>
<child>
- <widget class="GtkOptionMenu" id="new.file.type">
+ <widget class="GtkComboBox" id="new.file.type">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="items" translatable="no"></property>
<signal name="changed" handler="on_new_file_type_changed"/>
</widget>
<packing>
@@ -197,11 +197,11 @@
</packing>
</child>
<child>
- <widget class="GtkOptionMenu" id="new.file.menu.license">
+ <widget class="GtkComboBox" id="new.file.menu.license">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="items" translatable="no"></property>
</widget>
<packing>
<property name="left_attach">1</property>
Modified: trunk/plugins/file-wizard/file.c
==============================================================================
--- trunk/plugins/file-wizard/file.c (original)
+++ trunk/plugins/file-wizard/file.c Mon Mar 30 21:45:20 2009
@@ -170,8 +170,6 @@
create_new_file_dialog(IAnjutaDocumentManager *docman)
{
GtkWidget *optionmenu;
- GtkWidget *menu;
- GtkWidget *menuitem;
gint i;
nfg = g_new0(NewFileGUI, 1);
@@ -188,28 +186,22 @@
nfg->showing = FALSE;
optionmenu = glade_xml_get_widget(nfg->xml, NEW_FILE_TYPE);
- menu = gtk_menu_new();
for (i=0; i < (sizeof(new_file_type) / sizeof(NewfileType)); i++)
{
- menuitem = gtk_menu_item_new_with_label(new_file_type[i].name);
- gtk_menu_append(GTK_MENU(menu), menuitem);
- gtk_widget_show(menuitem);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (optionmenu), new_file_type[i].name);
}
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optionmenu), menu);
-
+ gtk_combo_box_set_active (GTK_COMBO_BOX (optionmenu), 0);
+
optionmenu = glade_xml_get_widget(nfg->xml, NEW_FILE_MENU_LICENSE);
- menu = gtk_menu_new();
for (i=0; i < (sizeof(new_license_type) / sizeof(NewlicenseType)); i++)
{
- menuitem = gtk_menu_item_new_with_label(new_license_type[i].name);
- gtk_menu_append(GTK_MENU(menu), menuitem);
- gtk_widget_show(menuitem);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (optionmenu), new_license_type[i].name);
}
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optionmenu), menu);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (optionmenu), 0);
g_object_set_data (G_OBJECT (nfg->dialog), "IAnjutaDocumentManager", docman);
glade_xml_signal_autoconnect(nfg->xml);
- gtk_signal_emit_by_name(GTK_OBJECT (optionmenu), "changed");
+ g_signal_emit_by_name(G_OBJECT (optionmenu), "changed");
return TRUE;
}
@@ -265,7 +257,7 @@
/* Create header file */
optionmenu = glade_xml_get_widget(nfg->xml, NEW_FILE_TYPE);
- source_type = gtk_option_menu_get_history(GTK_OPTION_MENU(optionmenu));
+ source_type = gtk_combo_box_get_active(GTK_COMBO_BOX(optionmenu));
checkbutton = glade_xml_get_widget(nfg->xml, NEW_FILE_HEADER);
if (GTK_WIDGET_SENSITIVE(checkbutton) &&
@@ -312,7 +304,7 @@
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton)))
{
optionmenu = glade_xml_get_widget(nfg->xml, NEW_FILE_MENU_LICENSE);
- sel = gtk_option_menu_get_history(GTK_OPTION_MENU(optionmenu));
+ sel = gtk_combo_box_get_active(GTK_COMBO_BOX(optionmenu));
license_type = new_license_type[sel].type;
comment_type = new_file_type[source_type].comment;
@@ -409,7 +401,7 @@
if (last_length != 2 && length == 1)
{
optionmenu = glade_xml_get_widget(nfg->xml, NEW_FILE_TYPE);
- sel = gtk_option_menu_get_history(GTK_OPTION_MENU(optionmenu));
+ sel = gtk_combo_box_get_active(GTK_COMBO_BOX(optionmenu));
name = g_strconcat (name, new_file_type[sel].ext, NULL);
gtk_entry_set_text (GTK_ENTRY(entry), name);
}
@@ -419,14 +411,14 @@
}
void
-on_new_file_type_changed (GtkOptionMenu *optionmenu, gpointer user_data)
+on_new_file_type_changed (GtkComboBox *optionmenu, gpointer user_data)
{
gint sel;
char *name, *tmp;
GtkWidget *widget;
GtkWidget *entry;
- sel = gtk_option_menu_get_history(optionmenu);
+ sel = gtk_combo_box_get_active(optionmenu);
widget = glade_xml_get_widget(nfg->xml, NEW_FILE_HEADER);
gtk_widget_set_sensitive(widget, new_file_type[sel].header >= 0);
Modified: trunk/plugins/file-wizard/file.h
==============================================================================
--- trunk/plugins/file-wizard/file.h (original)
+++ trunk/plugins/file-wizard/file.h Mon Mar 30 21:45:20 2009
@@ -30,7 +30,9 @@
{
#endif
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <gdk/gdk.h>
#include <libanjuta/anjuta-plugin.h>
#include <libanjuta/interfaces/ianjuta-editor.h>
#include <libanjuta/interfaces/ianjuta-document-manager.h>
@@ -44,7 +46,7 @@
gboolean on_new_file_okbutton_clicked(GtkWidget *window, GdkEvent *event,
gboolean user_data);
void on_new_file_entry_changed (GtkEditable *entry, gpointer user_data);
-void on_new_file_type_changed (GtkOptionMenu *optionmenu, gpointer user_data);
+void on_new_file_type_changed (GtkComboBox *optionmenu, gpointer user_data);
void on_new_file_license_toggled(GtkToggleButton *button, gpointer user_data);
typedef enum _Lge
Modified: trunk/plugins/gdb/debugger.c
==============================================================================
--- trunk/plugins/gdb/debugger.c (original)
+++ trunk/plugins/gdb/debugger.c Mon Mar 30 21:45:20 2009
@@ -35,6 +35,7 @@
#include <fcntl.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <libanjuta/anjuta-launcher.h>
#include <libanjuta/anjuta-debug.h>
Modified: trunk/plugins/gdb/plugin.c
==============================================================================
--- trunk/plugins/gdb/plugin.c (original)
+++ trunk/plugins/gdb/plugin.c Mon Mar 30 21:45:20 2009
@@ -28,6 +28,10 @@
#include <libanjuta/anjuta-debug.h>
#include "plugin.h"
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include "debugger.h"
Modified: trunk/plugins/gdb/utilities.c
==============================================================================
--- trunk/plugins/gdb/utilities.c (original)
+++ trunk/plugins/gdb/utilities.c Mon Mar 30 21:45:20 2009
@@ -32,7 +32,9 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include <gnome.h>
+#include <gdk/gdk.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#include <libanjuta/anjuta-launcher.h>
#include <libanjuta/interfaces/ianjuta-message-manager.h>
#include <libanjuta/interfaces/ianjuta-message-view.h>
Modified: trunk/plugins/gdb/utilities.h
==============================================================================
--- trunk/plugins/gdb/utilities.h (original)
+++ trunk/plugins/gdb/utilities.h Mon Mar 30 21:45:20 2009
@@ -278,11 +278,11 @@
const gchar *iconfile,
const gchar *label,
const gchar *tooltip,
- GtkSignalFunc callback,
+ GCallBack callback,
gpointer user_data);
GtkWidget *
anjuta_util_toolbar_append_stock (GtkWidget *toolbar, const gchar *stock_icon,
- const gchar *tooltip, GtkSignalFunc callback,
+ const gchar *tooltip, GCallBack callback,
gpointer user_data);
GtkWidget*
Modified: trunk/plugins/glade/designer-associations-item.c
==============================================================================
--- trunk/plugins/glade/designer-associations-item.c (original)
+++ trunk/plugins/glade/designer-associations-item.c Mon Mar 30 21:45:20 2009
@@ -470,7 +470,7 @@
else
{
i = g_ascii_strtoll ((gchar *)value, NULL, 10);
- if (errno != 0)
+ if (error != NULL)
{
g_set_error (error,
DESIGNER_ASSOCIATIONS_ERROR,
Modified: trunk/plugins/glade/plugin.c
==============================================================================
--- trunk/plugins/glade/plugin.c (original)
+++ trunk/plugins/glade/plugin.c Mon Mar 30 21:45:20 2009
@@ -4402,10 +4402,18 @@
gtk_toolbar_insert (GTK_TOOLBAR (priv->designer_toolbar), GTK_TOOL_ITEM (priv->button_redo), 7);
action = gtk_action_group_get_action (priv->action_group, "ActionGladeUndo");
+#if GTK_MINOR_VERSION < 16
gtk_action_connect_proxy (action, GTK_WIDGET (priv->button_undo));
+#else
+ gtk_activatable_set_related_action (GTK_ACTIVATABLE (priv->button_undo), action);
+#endif
action = gtk_action_group_get_action (priv->action_group, "ActionGladeRedo");
+#if GTK_MINOR_VERSION < 16
gtk_action_connect_proxy (action, GTK_WIDGET (priv->button_redo));
+#else
+ gtk_activatable_set_related_action (GTK_ACTIVATABLE (priv->button_redo), action);
+#endif
if (!GTK_IS_WINDOW (glade_app_get_clipboard_view()))
anjuta_shell_add_widget (ANJUTA_PLUGIN (plugin)->shell,
Modified: trunk/plugins/gtodo/add_edit_item.c
==============================================================================
--- trunk/plugins/gtodo/add_edit_item.c (original)
+++ trunk/plugins/gtodo/add_edit_item.c Mon Mar 30 21:45:20 2009
@@ -6,7 +6,7 @@
guint64 julian=0, start_jul=0, stop_jul=0;
void add_edit_completed_toggled(GtkWidget *checkbox, GtkWidget *rlabel);
-void add_edit_option_changed(GtkOptionMenu *option, GtkWidget *menu);
+void add_edit_option_changed(GtkComboBox *option, gpointer data);
static
void check_length(GtkWidget *entry, GtkWidget *button)
@@ -56,6 +56,15 @@
else gtk_widget_set_sensitive(notify, TRUE);
}
+static gboolean
+RowSeparatorFunc (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+ int n, col = gtk_tree_model_iter_n_children (model, NULL);
+ gchar *path = gtk_tree_model_get_string_from_iter (model, iter);
+ sscanf (path, "%d", &n);
+ g_free (path);
+ return col - 2 == n;
+}
void gui_add_todo_item(GtkWidget *useless, gpointer data, guint32 openid){
GtkWidget *dialog;
@@ -64,8 +73,7 @@
GtkWidget *priority;
GtkWidget *label;
GtkWidget *text_view;
- GtkWidget *menus;
- GtkWidget *option, *menu;
+ GtkWidget *option;
GtkWidget *vbox, *hbox2, *vbox2;
GtkTreeIter iter;
GtkTextBuffer *buffer;
@@ -77,7 +85,7 @@
GtkWidget *rlabel=NULL, *notify_cb, *llabel=NULL;
gchar *tempstr;
guint64 idvalue;
- int i;
+ int i, k;
int edit = GPOINTER_TO_INT(data);
GtkTreeSelection *selection;
GtkTreeModel *model = mw.sortmodel;
@@ -167,28 +175,28 @@
gtk_size_group_add_widget(sglabel, label);
/* option menu */
- option = gtk_option_menu_new();
+ option = gtk_combo_box_new_text();
- menu = gtk_menu_new();
- gtk_option_menu_set_menu(GTK_OPTION_MENU(option), menu);
- for(i = 0; i < (categorys); i++)
+ for(i = 0, k = 0; i < (categorys); i++)
{
- menus = gtk_menu_item_new_with_label(mw.mitems[i]->date);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menus);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (option), mw.mitems[i]->date);
if(edit){
if(!g_utf8_collate(gtodo_todo_item_get_category(item), mw.mitems[i]->date))
{
- gtk_option_menu_set_history(GTK_OPTION_MENU(option), i);
+ k = i;
}
}
}
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_menu_item_new_with_label(_("Edit Categories")));
+ gtk_combo_box_set_active(GTK_COMBO_BOX(option), k);
+
+ gtk_combo_box_append_text (GTK_COMBO_BOX (option), "");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (option), _("Edit Categories"));
+ gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (option), RowSeparatorFunc, NULL, NULL);
g_free(category);
- g_signal_connect(G_OBJECT(option), "changed", G_CALLBACK( add_edit_option_changed ), menu);
- if(!edit)gtk_option_menu_set_history(GTK_OPTION_MENU(option), gtk_option_menu_get_history(GTK_OPTION_MENU(mw.option))-2);
+ g_signal_connect(G_OBJECT(option), "changed", G_CALLBACK( add_edit_option_changed ), NULL);
+ if(!edit)gtk_combo_box_set_active(GTK_COMBO_BOX(option), gtk_combo_box_get_active(GTK_COMBO_BOX (mw.option))-2);
gtk_box_pack_start(GTK_BOX(hbox2), option, TRUE, TRUE, 0);
gtk_size_group_add_widget(sgdd, option);
@@ -233,19 +241,13 @@
/* fixme move pmenu and menui up */
{
- GtkWidget *pmenu, *menui;
- priority = gtk_option_menu_new();
+ priority = gtk_combo_box_new_text();
- pmenu = gtk_menu_new();
- gtk_option_menu_set_menu(GTK_OPTION_MENU(priority), pmenu);
- menui = gtk_menu_item_new_with_label(_("High"));
- gtk_menu_shell_append (GTK_MENU_SHELL (pmenu), menui);
- menui = gtk_menu_item_new_with_label(_("Medium"));
- gtk_menu_shell_append (GTK_MENU_SHELL (pmenu), menui);
- menui = gtk_menu_item_new_with_label(_("Low"));
- gtk_menu_shell_append (GTK_MENU_SHELL (pmenu), menui);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (priority), "High");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (priority), "Medium");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (priority), "Low");
- gtk_option_menu_set_history(GTK_OPTION_MENU(priority), 1);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (priority), 1);
gtk_box_pack_start(GTK_BOX(hbox2), priority,TRUE, TRUE, 0);
gtk_size_group_add_widget(sgdd, priority);
}
@@ -322,7 +324,7 @@
/* make sure that the calendar is insensitive when needed */
gtk_entry_set_text(GTK_ENTRY(summary), gtodo_todo_item_get_summary(item));
- gtk_option_menu_set_history(GTK_OPTION_MENU(priority), 2-gtodo_todo_item_get_priority(item));
+ gtk_combo_box_set_active(GTK_COMBO_BOX(priority), 2-gtodo_todo_item_get_priority(item));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(done_check), gtodo_todo_item_get_done(item));
gtk_text_buffer_set_text(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_view)), gtodo_todo_item_get_comment(item), -1);
{
@@ -364,8 +366,8 @@
gtk_text_buffer_get_iter_at_offset (buffer, &first, 0);
gtk_text_buffer_get_iter_at_offset (buffer, &last, -1);
- gtodo_todo_item_set_category(item, mw.mitems[gtk_option_menu_get_history(GTK_OPTION_MENU(option))]->date);
- gtodo_todo_item_set_priority(item, 2-gtk_option_menu_get_history(GTK_OPTION_MENU(priority)));
+ gtodo_todo_item_set_category(item, mw.mitems[gtk_combo_box_get_active(GTK_COMBO_BOX(option))]->date);
+ gtodo_todo_item_set_priority(item, 2-gtk_combo_box_get_active(GTK_COMBO_BOX(priority)));
if(edit) gtodo_todo_item_set_done(item, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(done_check)));
/*( COMPLETED_DATE */
/* if(edit)
@@ -449,25 +451,27 @@
g_free(tempstr);
}
-void add_edit_option_changed(GtkOptionMenu *option, GtkWidget *menu)
+void add_edit_option_changed(GtkComboBox *option, gpointer data)
{
- int i = gtk_option_menu_get_history(option);
- GtkWidget *menus;
+ int i = gtk_combo_box_get_active(option);
if(i == categorys +1)
{
category_manager();
- gtk_widget_destroy(menu);
- menu = gtk_menu_new();
- gtk_option_menu_set_menu(GTK_OPTION_MENU(option), menu);
+
+ while (gtk_tree_model_iter_n_children (gtk_combo_box_get_model (option), NULL) > 0) {
+ gtk_combo_box_remove_text (option, 0);
+ }
+
for(i = 0; i < (categorys); i++)
{
- menus = gtk_menu_item_new_with_label(mw.mitems[i]->date);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menus);
+ gtk_combo_box_append_text (option, mw.mitems[i]->date);
}
- gtk_option_menu_set_history(GTK_OPTION_MENU(option), 0);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_menu_item_new_with_label(_("Edit Categories")));
- gtk_widget_show_all(GTK_WIDGET(option));
+ gtk_combo_box_set_active(GTK_COMBO_BOX(option), 0);
+ gtk_combo_box_append_text (option, "");
+ gtk_combo_box_append_text (option, _("Edit Categories"));
+ gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (option), RowSeparatorFunc, NULL, NULL);
+
+ gtk_widget_show_all(GTK_WIDGET(option));
}
}
Modified: trunk/plugins/gtodo/callback.c
==============================================================================
--- trunk/plugins/gtodo/callback.c (original)
+++ trunk/plugins/gtodo/callback.c Mon Mar 30 21:45:20 2009
@@ -39,13 +39,14 @@
{
if(cl != NULL)
{
- int i = gtk_option_menu_get_history(GTK_OPTION_MENU(mw.option));
+ int i = gtk_combo_box_get_active(GTK_COMBO_BOX(mw.option));
+ if (i < 0) return;
if(i != 0)if( mw.mitems == NULL || mw.mitems[i-2] == NULL) return;
if(i == categorys+3)
{
int j = gconf_client_get_int(client, "/apps/gtodo/view/last-category",NULL);
category_manager();
- if(j < categorys+3 && mw.mitems != NULL && mw.mitems[j-2] != NULL) gtk_option_menu_set_history(GTK_OPTION_MENU(mw.option),j);
+ if(j < categorys+3 && mw.mitems != NULL && mw.mitems[j-2] != NULL) gtk_combo_box_set_active(GTK_COMBO_BOX(mw.option),j);
gtk_list_store_clear(mw.list);
load_category();
return;
@@ -94,8 +95,8 @@
gchar *category;
gchar *tm;
- if(gtk_option_menu_get_history(GTK_OPTION_MENU(mw.option))== 0)tm = g_strdup_printf(_("Are you sure you want to remove all the completed todo items?"));
- else tm = g_strdup_printf(_("Are you sure you want to remove all the completed todo items in the category \"%s\"?"), mw.mitems[gtk_option_menu_get_history(GTK_OPTION_MENU(mw.option))-2]->date);
+ if(gtk_combo_box_get_active(GTK_COMBO_BOX(mw.option))== 0)tm = g_strdup_printf(_("Are you sure you want to remove all the completed todo items?"));
+ else tm = g_strdup_printf(_("Are you sure you want to remove all the completed todo items in the category \"%s\"?"), mw.mitems[gtk_combo_box_get_active(GTK_COMBO_BOX(mw.option))-2]->date);
if(!message_box( tm, _("Remove"), GTK_MESSAGE_WARNING))
{
Modified: trunk/plugins/gtodo/export.c
==============================================================================
--- trunk/plugins/gtodo/export.c (original)
+++ trunk/plugins/gtodo/export.c Mon Mar 30 21:45:20 2009
@@ -94,7 +94,7 @@
{
int i= 0, cat = 0;
for(i=0;param_string[i] != NULL;i++);
- cat = gtk_option_menu_get_history (GTK_OPTION_MENU (mw.option));
+ cat = gtk_combo_box_get_active (GTK_COMBO_BOX (mw.option));
if(cat != 0)
{
Modified: trunk/plugins/gtodo/interface.c
==============================================================================
--- trunk/plugins/gtodo/interface.c (original)
+++ trunk/plugins/gtodo/interface.c Mon Mar 30 21:45:20 2009
@@ -89,7 +89,7 @@
int i = gconf_client_get_int(client, "/apps/gtodo/view/last-category",NULL);
debug_printf(DEBUG_INFO, "Reading categories");
read_categorys();
- gtk_option_menu_set_history(GTK_OPTION_MENU(mw.option),i);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(mw.option),i);
}
/* nasty thing to fix the tooltip in the list */
if(gconf_client_get_bool(client, "/apps/gtodo/prefs/show-tooltip",NULL))
@@ -139,17 +139,16 @@
gtk_container_set_border_width(GTK_CONTAINER(mw.toolbar), 6);
/* add drop down menu's */
- mw.option = gtk_option_menu_new();
- mw.menu = gtk_menu_new();
+ mw.option = gtk_combo_box_new_text();
// gtk_widget_set_size_request(mw.option, 120 , -1);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(mw.option), mw.menu);
gtk_box_pack_start(GTK_BOX(mw.toolbar), mw.option, FALSE, FALSE, 0);
- gtk_menu_shell_insert (GTK_MENU_SHELL (mw.menu), gtk_menu_item_new_with_label (_("All")), 0);
- gtk_menu_shell_insert (GTK_MENU_SHELL (mw.menu), gtk_separator_menu_item_new(), 1);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (mw.option), _("All"));
+ gtk_combo_box_append_text (GTK_COMBO_BOX (mw.option), "");
mw.mitems = g_malloc(1*sizeof(GtkWidget *));
mw.mitems[0] = NULL;
/* shand can be removed?? */
+ gtk_combo_box_set_active (GTK_COMBO_BOX (mw.option), 0);
shand = g_signal_connect(G_OBJECT(mw.option), "changed", G_CALLBACK(category_changed), NULL);
/* the buttonbox buttons */
Modified: trunk/plugins/gtodo/list_tooltip.c
==============================================================================
--- trunk/plugins/gtodo/list_tooltip.c (original)
+++ trunk/plugins/gtodo/list_tooltip.c Mon Mar 30 21:45:20 2009
@@ -18,7 +18,7 @@
GtkTreePath *path;
GtkTreeIter iterp, iter;
GTodoItem *item;
- int i = gtk_option_menu_get_history(GTK_OPTION_MENU(mw.option));
+ int i = gtk_combo_box_get_active(GTK_COMBO_BOX(mw.option));
string = g_string_new("");
if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(mw.treeview), rect.x, rect.y, &path, NULL, NULL, NULL))
{
Modified: trunk/plugins/gtodo/main.h
==============================================================================
--- trunk/plugins/gtodo/main.h (original)
+++ trunk/plugins/gtodo/main.h Mon Mar 30 21:45:20 2009
@@ -36,7 +36,6 @@
};
typedef struct{
- GtkWidget *item;
gchar *date;
} catitems;
@@ -52,10 +51,9 @@
GtkWidget *tbdelbut, *tbaddbut, *tbeditbut;
GtkWidget *tbeditlb;
GtkWidget *tbexport;
- GtkWidget *option, *menu;
+ GtkWidget *option;
catitems **mitems;
GtkAccelGroup *accel_group;
- GtkItemFactory *item_factory;
} mwindow;
Modified: trunk/plugins/gtodo/mcategory.c
==============================================================================
--- trunk/plugins/gtodo/mcategory.c (original)
+++ trunk/plugins/gtodo/mcategory.c Mon Mar 30 21:45:20 2009
@@ -48,7 +48,7 @@
/* the buttonbox */
vbutbox = gtk_vbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(vbutbox), GTK_BUTTONBOX_START);
- gtk_button_box_set_spacing(GTK_BUTTON_BOX(vbutbox), 6);
+ gtk_box_set_spacing (GTK_BOX(vbutbox), 6);
gtk_box_pack_start(GTK_BOX(hbox), vbutbox, FALSE, TRUE, 0);
Modified: trunk/plugins/gtodo/tasklists.c
==============================================================================
--- trunk/plugins/gtodo/tasklists.c (original)
+++ trunk/plugins/gtodo/tasklists.c Mon Mar 30 21:45:20 2009
@@ -6,12 +6,16 @@
{
GtkWidget *selection = NULL;
gchar *path = NULL;
- selection = gtk_file_selection_new(_("Open a Task List"));
+ selection = gtk_file_chooser_dialog_new (_("Open a Task List"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ NULL);
+
switch(gtk_dialog_run(GTK_DIALOG(selection)))
{
case GTK_RESPONSE_OK:
- path = g_strdup_printf("gtodo \"%s\"",gtk_file_selection_get_filename(GTK_FILE_SELECTION(selection)));
+ path = g_strdup_printf("gtodo \"%s\"",gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selection)));
g_print("%s\n", path);
g_spawn_command_line_async(path, NULL);
g_free(path);
@@ -27,12 +31,15 @@
{
GtkWidget *selection = NULL;
gchar *path = NULL;
- selection = gtk_file_selection_new(_("Create a Task List"));
+ selection = gtk_file_chooser_dialog_new (_("Create a Task List"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ NULL);
switch(gtk_dialog_run(GTK_DIALOG(selection)))
{
case GTK_RESPONSE_OK:
- path = g_strdup_printf("gtodo %s",gtk_file_selection_get_filename(GTK_FILE_SELECTION(selection)));
+ path = g_strdup_printf("gtodo %s",gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selection)));
g_print("%s\n", path);
g_spawn_command_line_async(path, NULL);
g_free(path);
Modified: trunk/plugins/gtodo/todo_db.c
==============================================================================
--- trunk/plugins/gtodo/todo_db.c (original)
+++ trunk/plugins/gtodo/todo_db.c Mon Mar 30 21:45:20 2009
@@ -5,13 +5,25 @@
int categorys = 0;
+static gboolean
+RowSeparatorFunc (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+ gboolean ret = FALSE;
+ int i, size = gtk_tree_model_iter_n_children (model, NULL);
+ gchar *path = gtk_tree_model_get_string_from_iter (model, iter);
+ sscanf (path, "%d", &i);
+ if (i == 1 || i == size - 2)
+ ret = TRUE;
+ g_free (path);
+ return ret;
+}
void read_categorys (void)
{
int last_category;
GTodoList *list;
- last_category = gtk_option_menu_get_history (GTK_OPTION_MENU (mw.option));
+ last_category = gtk_combo_box_get_active (GTK_COMBO_BOX (mw.option));
if (mw.mitems != NULL)
{
int i;
@@ -19,8 +31,7 @@
{
if (mw.mitems[i]->date != NULL)
g_free (mw.mitems[i]->date);
-
- gtk_widget_destroy (mw.mitems[i]->item);
+ gtk_combo_box_remove_text (GTK_COMBO_BOX (mw.option), 2);
g_free (mw.mitems[i]);
}
categorys = 0;
@@ -36,13 +47,11 @@
mw.mitems = g_realloc (mw.mitems, (categorys + 2) * sizeof (int *));
mw.mitems[categorys + 1] = NULL;
mw.mitems[categorys] = g_malloc (sizeof (catitems));
- mw.mitems[categorys]->item =
- gtk_menu_item_new_with_label (gtodo_client_get_category_from_list
- (list));
+
+ gtk_combo_box_append_text (GTK_COMBO_BOX (mw.option),
+ gtodo_client_get_category_from_list (list));
mw.mitems[categorys]->date =
g_strdup (gtodo_client_get_category_from_list (list));
- gtk_menu_shell_append (GTK_MENU_SHELL (mw.menu),
- mw.mitems[categorys]->item);
categorys++;
}
while (gtodo_client_get_list_next (list));
@@ -57,32 +66,22 @@
mw.mitems[categorys] = g_malloc (sizeof (catitems));
- mw.mitems[categorys]->item = gtk_separator_menu_item_new ();
+ gtk_combo_box_append_text (GTK_COMBO_BOX (mw.option), "");
mw.mitems[categorys]->date = g_strdup ("");
- gtk_menu_shell_append (GTK_MENU_SHELL (mw.menu),
- mw.mitems[categorys]->item);
-
-
mw.mitems[categorys + 1] = g_malloc (sizeof (catitems));
- mw.mitems[categorys + 1]->item =
- gtk_menu_item_new_with_label (_("Edit Categories"));
- gtk_menu_item_new_with_label (_("Edit Categories"));
mw.mitems[categorys + 1]->date = g_strdup (("Edit"));
-
-
- gtk_menu_shell_append (GTK_MENU_SHELL (mw.menu),
- mw.mitems[categorys + 1]->item);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (mw.option), _("Edit Categories"));
}
-
- gtk_widget_show_all (mw.menu);
+ gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (mw.option), RowSeparatorFunc, NULL, NULL);
+ gtk_widget_show_all (mw.option);
if (categorys > 0)
{
if (last_category != -1 && last_category <= categorys + 1)
- gtk_option_menu_set_history (GTK_OPTION_MENU (mw.option), last_category);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (mw.option), last_category);
else
- gtk_option_menu_set_history (GTK_OPTION_MENU (mw.option), 0);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (mw.option), 0);
}
}
@@ -96,11 +95,11 @@
GTodoList *list;
gboolean all = FALSE;
gchar *category;
- if (gtk_option_menu_get_history (GTK_OPTION_MENU (mw.option)) == 0)
+ if (gtk_combo_box_get_active (GTK_COMBO_BOX (mw.option)) == 0)
all = TRUE;
if (!all)
category =
- mw.mitems[gtk_option_menu_get_history (GTK_OPTION_MENU (mw.option)) -
+ mw.mitems[gtk_combo_box_get_active (GTK_COMBO_BOX (mw.option)) -
2]->date;
else
category = NULL;
Modified: trunk/plugins/indent/indent-dialog.c
==============================================================================
--- trunk/plugins/indent/indent-dialog.c (original)
+++ trunk/plugins/indent/indent-dialog.c Mon Mar 30 21:45:20 2009
@@ -161,12 +161,12 @@
ptrdata = data;
indent_widget_signal_connect(ptrdata->checkbutton, "toggled",
- GTK_SIGNAL_FUNC(on_indent_checkbutton_toggled),
+ G_CALLBACK(on_indent_checkbutton_toggled),
idt);
if (ptrdata->spinbutton)
indent_widget_signal_connect(ptrdata->spinbutton, "value_changed",
- GTK_SIGNAL_FUNC(on_indent_spinbutton_value_changed),
+ G_CALLBACK(on_indent_spinbutton_value_changed),
idt);
}
@@ -276,11 +276,11 @@
}
}
indent_block_widget(PARAMETERS_ENTRY,
- GTK_SIGNAL_FUNC (on_indent_parameters_entry_changed),
+ G_CALLBACK (on_indent_parameters_entry_changed),
TRUE, idt);
indent_entry_set_chars(line, idt);
indent_block_widget(PARAMETERS_ENTRY,
- GTK_SIGNAL_FUNC (on_indent_parameters_entry_changed),
+ G_CALLBACK (on_indent_parameters_entry_changed),
FALSE, idt);
g_free(line);
}
@@ -304,11 +304,11 @@
line = indent_insert_option(line, option);
g_free(option);
indent_block_widget(PARAMETERS_ENTRY,
- GTK_SIGNAL_FUNC (on_indent_parameters_entry_changed),
+ G_CALLBACK (on_indent_parameters_entry_changed),
TRUE, idt);
indent_entry_set_chars(line, idt);
indent_block_widget(PARAMETERS_ENTRY,
- GTK_SIGNAL_FUNC (on_indent_parameters_entry_changed),
+ G_CALLBACK (on_indent_parameters_entry_changed),
FALSE, idt);
g_free(line);
}
@@ -364,10 +364,10 @@
indent_set_style_combo(idt->style_active, idt);
g_signal_connect(GTK_OBJECT(idt->dialog), "delete_event",
- (GtkSignalFunc)indent_exit,
+ (GCallBack)indent_exit,
NULL);
g_signal_connect(GTK_OBJECT(idt->dialog), "destroy",
- (GtkSignalFunc)indent_exit,
+ (GCallBack)indent_exit,
NULL);
return idt->dialog;
}
Modified: trunk/plugins/language-support-cpp-java/plugin.c
==============================================================================
--- trunk/plugins/language-support-cpp-java/plugin.c (original)
+++ trunk/plugins/language-support-cpp-java/plugin.c Mon Mar 30 21:45:20 2009
@@ -20,6 +20,7 @@
#include <config.h>
#include <ctype.h>
+#include <stdlib.h>
#include <libanjuta/anjuta-shell.h>
#include <libanjuta/anjuta-debug.h>
#include <libanjuta/interfaces/ianjuta-iterable.h>
Modified: trunk/plugins/macro/macro-actions.c
==============================================================================
--- trunk/plugins/macro/macro-actions.c (original)
+++ trunk/plugins/macro/macro-actions.c Mon Mar 30 21:45:20 2009
@@ -137,8 +137,8 @@
gtk_window_set_decorated(GTK_WINDOW(window), FALSE);
gtk_container_add(GTK_CONTAINER(window), hbox);
- gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
- gtk_box_pack_end_defaults(GTK_BOX(hbox), entry);
+ gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_end(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
g_signal_connect (G_OBJECT (window), "key-press-event",
G_CALLBACK (on_shortcut_pressed), plugin);
gtk_widget_grab_focus (entry);
Modified: trunk/plugins/macro/macro-util.c
==============================================================================
--- trunk/plugins/macro/macro-util.c (original)
+++ trunk/plugins/macro/macro-util.c Mon Mar 30 21:45:20 2009
@@ -18,6 +18,7 @@
*/
#include "macro-util.h"
+#include <stdlib.h>
#include <libanjuta/interfaces/ianjuta-document-manager.h>
Modified: trunk/plugins/message-view/anjuta-msgman.c
==============================================================================
--- trunk/plugins/message-view/anjuta-msgman.c (original)
+++ trunk/plugins/message-view/anjuta-msgman.c Mon Mar 30 21:45:20 2009
@@ -309,7 +309,7 @@
G_CALLBACK (on_message_view_destroy), msgman);
g_signal_handlers_block_by_func (GTK_OBJECT (msgman),
- GTK_SIGNAL_FUNC
+ G_CALLBACK
(on_notebook_switch_page), msgman);
page_num =
@@ -325,7 +325,7 @@
anjuta_msgman_set_current_view (msgman, NULL);
g_signal_handlers_unblock_by_func (GTK_OBJECT (msgman),
- GTK_SIGNAL_FUNC
+ G_CALLBACK
(on_notebook_switch_page), msgman);
}
@@ -344,7 +344,7 @@
gtk_widget_show_all (page->box);
g_signal_handlers_block_by_func (GTK_OBJECT (msgman),
- GTK_SIGNAL_FUNC
+ G_CALLBACK
(on_notebook_switch_page), msgman);
msgman->priv->views =
g_list_prepend (msgman->priv->views, (gpointer) page);
@@ -355,7 +355,7 @@
g_signal_connect (G_OBJECT (mv), "destroy",
G_CALLBACK (on_message_view_destroy), msgman);
g_signal_handlers_unblock_by_func (GTK_OBJECT (msgman),
- GTK_SIGNAL_FUNC
+ G_CALLBACK
(on_notebook_switch_page), msgman);
g_signal_emit_by_name(G_OBJECT(msgman), "view_changed");
}
@@ -398,7 +398,7 @@
AnjutaMsgmanPage *page;
g_signal_handlers_block_by_func (GTK_OBJECT (msgman),
- GTK_SIGNAL_FUNC
+ G_CALLBACK
(on_notebook_switch_page), msgman);
views = NULL;
node = msgman->priv->views;
@@ -421,7 +421,7 @@
msgman->priv->views = NULL;
anjuta_msgman_set_current_view (msgman, NULL);
g_signal_handlers_unblock_by_func (GTK_OBJECT (msgman),
- GTK_SIGNAL_FUNC
+ G_CALLBACK
(on_notebook_switch_page), msgman);
}
Modified: trunk/plugins/message-view/message-view.h
==============================================================================
--- trunk/plugins/message-view/message-view.h (original)
+++ trunk/plugins/message-view/message-view.h Mon Mar 30 21:45:20 2009
@@ -18,7 +18,10 @@
#ifndef MESSAGE_VIEW_H
#define MESSAGE_VIEW_H
-#include <gnome.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
#include <libanjuta/anjuta-preferences.h>
#include <libanjuta/anjuta-serializer.h>
Modified: trunk/plugins/patch/patch-plugin.c
==============================================================================
--- trunk/plugins/patch/patch-plugin.c (original)
+++ trunk/plugins/patch/patch-plugin.c Mon Mar 30 21:45:20 2009
@@ -123,7 +123,7 @@
scale = glade_xml_get_widget(gxml, "patch_level_scale");
adj = gtk_range_get_adjustment(GTK_RANGE(scale));
g_signal_connect (G_OBJECT(adj), "value_changed",
- GTK_SIGNAL_FUNC (patch_level_changed), NULL);
+ G_CALLBACK (patch_level_changed), NULL);
plugin->patch_button = glade_xml_get_widget(gxml, "patch_button");
plugin->cancel_button = glade_xml_get_widget(gxml, "cancel_button");
Modified: trunk/plugins/project-manager/gbf-project-model.h
==============================================================================
--- trunk/plugins/project-manager/gbf-project-model.h (original)
+++ trunk/plugins/project-manager/gbf-project-model.h Mon Mar 30 21:45:20 2009
@@ -29,10 +29,10 @@
#include "gbf-tree-data.h"
#define GBF_TYPE_PROJECT_MODEL (gbf_project_model_get_type ())
-#define GBF_PROJECT_MODEL(obj) (GTK_CHECK_CAST ((obj), GBF_TYPE_PROJECT_MODEL, GbfProjectModel))
-#define GBF_PROJECT_MODEL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GBF_TYPE_PROJECT_MODEL, GbfProjectModelClass))
-#define GBF_IS_PROJECT_MODEL(obj) (GTK_CHECK_TYPE ((obj), GBF_TYPE_PROJECT_MODEL))
-#define GBF_IS_PROJECT_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GBF_TYPE_PROJECT_MODEL))
+#define GBF_PROJECT_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GBF_TYPE_PROJECT_MODEL, GbfProjectModel))
+#define GBF_PROJECT_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GBF_TYPE_PROJECT_MODEL, GbfProjectModelClass))
+#define GBF_IS_PROJECT_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GBF_TYPE_PROJECT_MODEL))
+#define GBF_IS_PROJECT_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GBF_TYPE_PROJECT_MODEL))
typedef struct _GbfProjectModel GbfProjectModel;
typedef struct _GbfProjectModelClass GbfProjectModelClass;
Modified: trunk/plugins/project-manager/gbf-project-view.h
==============================================================================
--- trunk/plugins/project-manager/gbf-project-view.h (original)
+++ trunk/plugins/project-manager/gbf-project-view.h Mon Mar 30 21:45:20 2009
@@ -29,10 +29,10 @@
G_BEGIN_DECLS
#define GBF_TYPE_PROJECT_VIEW (gbf_project_view_get_type ())
-#define GBF_PROJECT_VIEW(obj) (GTK_CHECK_CAST ((obj), GBF_TYPE_PROJECT_VIEW, GbfProjectView))
-#define GBF_PROJECT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GBF_TYPE_PROJECT_VIEW, GbfProjectViewClass))
-#define GBF_IS_PROJECT_VIEW(obj) (GTK_CHECK_TYPE ((obj), GBF_TYPE_PROJECT_VIEW))
-#define GBF_IS_PROJECT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GBF_TYPE_PROJECT_VIEW))
+#define GBF_PROJECT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GBF_TYPE_PROJECT_VIEW, GbfProjectView))
+#define GBF_PROJECT_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GBF_TYPE_PROJECT_VIEW, GbfProjectViewClass))
+#define GBF_IS_PROJECT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GBF_TYPE_PROJECT_VIEW))
+#define GBF_IS_PROJECT_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GBF_TYPE_PROJECT_VIEW))
typedef struct _GbfProjectView GbfProjectView;
typedef struct _GbfProjectViewPrivate GbfProjectViewPrivate;
Modified: trunk/plugins/project-wizard/autogen.c
==============================================================================
--- trunk/plugins/project-wizard/autogen.c (original)
+++ trunk/plugins/project-wizard/autogen.c Mon Mar 30 21:45:20 2009
@@ -37,7 +37,7 @@
#include <glib/gstdio.h>
#include <glib.h>
-
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Modified: trunk/plugins/project-wizard/druid.c
==============================================================================
--- trunk/plugins/project-wizard/druid.c (original)
+++ trunk/plugins/project-wizard/druid.c Mon Mar 30 21:45:20 2009
@@ -37,9 +37,10 @@
#include <libanjuta/anjuta-debug.h>
#include <libanjuta/anjuta-utils.h>
#include <libanjuta/interfaces/ianjuta-wizard.h>
-
-#include <gnome.h>
+#include <stdlib.h>
#include <glib/gi18n.h>
+#include <glib.h>
+#include <gdk/gdk.h>
#include <gtk/gtk.h>
@@ -86,8 +87,6 @@
GtkLabel *error_message;
GtkWidget *error_detail;
- GtkTooltips *tooltips;
-
const gchar* project_file;
NPWPlugin* plugin;
@@ -419,17 +418,7 @@
/* Set description tooltip */
if (description && (*description != '\0'))
{
- GtkTooltips *tooltips;
-
- tooltips = data->druid->tooltips;
- if (!tooltips)
- {
- tooltips = data->druid->tooltips = gtk_tooltips_new ();
- data->druid->tooltips = tooltips;
- g_object_ref (tooltips);
- gtk_object_sink (GTK_OBJECT (tooltips));
- }
- gtk_tooltips_set_tip (tooltips, entry, description, NULL);
+ gtk_widget_set_tooltip_text (entry, description);
}
/* Add label and entry */
@@ -1054,7 +1043,6 @@
druid = g_new0(NPWDruid, 1);
druid->plugin = plugin;
- druid->tooltips = NULL;
druid->project_file = NULL;
druid->busy = FALSE;
druid->page_list = g_queue_new ();
@@ -1081,12 +1069,6 @@
g_return_if_fail (druid != NULL);
- if (druid->tooltips)
- {
- g_object_unref (druid->tooltips);
- druid->tooltips = NULL;
- }
-
/* Delete page list */
druid->next_page = PROPERTY_PAGE;
npw_druid_remove_following_page (druid);
Modified: trunk/plugins/project-wizard/property.c
==============================================================================
--- trunk/plugins/project-wizard/property.c (original)
+++ trunk/plugins/project-wizard/property.c Mon Mar 30 21:45:20 2009
@@ -29,10 +29,11 @@
#include <glib.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
-
+#include <gnome.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
Modified: trunk/plugins/run-program/parameters.c
==============================================================================
--- trunk/plugins/run-program/parameters.c (original)
+++ trunk/plugins/run-program/parameters.c Mon Mar 30 21:45:20 2009
@@ -627,7 +627,7 @@
g_object_unref (gxml);
/* Fill parameter combo box */
- model = GTK_TREE_MODEL (gtk_list_store_new (1, GTK_TYPE_STRING));
+ model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
gtk_combo_box_set_model (dlg->args, model);
gtk_combo_box_entry_set_text_column( GTK_COMBO_BOX_ENTRY(dlg->args), 0);
g_list_foreach (plugin->recent_args, on_add_string_in_model, model);
@@ -642,7 +642,7 @@
if (plugin->recent_dirs != NULL) gtk_file_chooser_set_uri (dlg->dirs, (const char *)plugin->recent_dirs->data);
/* Fill target combo box */
- model = GTK_TREE_MODEL (gtk_list_store_new (1, GTK_TYPE_STRING));
+ model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
gtk_combo_box_set_model (dlg->target, model);
gtk_combo_box_entry_set_text_column( GTK_COMBO_BOX_ENTRY(dlg->target), 0);
g_list_foreach (plugin->recent_target, on_add_uri_in_model, model);
Modified: trunk/plugins/scintilla/anjuta-editor-scintilla.glade
==============================================================================
--- trunk/plugins/scintilla/anjuta-editor-scintilla.glade (original)
+++ trunk/plugins/scintilla/anjuta-editor-scintilla.glade Mon Mar 30 21:45:20 2009
@@ -1192,9 +1192,9 @@
</packing>
</child>
<child>
- <widget class="GtkCombo" id="combo">
+ <widget class="GtkComboBox" id="comboBox">
<property name="visible">True</property>
- <property name="enable_arrows_always">False</property>
+ <property name="items" translatable="no"></property>
</widget>
<packing>
<property name="position">1</property>
Modified: trunk/plugins/scintilla/print.c
==============================================================================
--- trunk/plugins/scintilla/print.c (original)
+++ trunk/plugins/scintilla/print.c Mon Mar 30 21:45:20 2009
@@ -25,6 +25,7 @@
#endif
#include <ctype.h>
+#include <stdlib.h>
#include <string.h>
#include <libanjuta/anjuta-utils.h>
Modified: trunk/plugins/scintilla/scintilla/PlatGTK.cxx
==============================================================================
--- trunk/plugins/scintilla/scintilla/PlatGTK.cxx (original)
+++ trunk/plugins/scintilla/scintilla/PlatGTK.cxx Mon Mar 30 21:45:20 2009
@@ -1787,7 +1787,7 @@
if (oy + sizey > screenHeight)
oy = screenHeight - sizey;
- gtk_widget_set_uposition(PWidget(id), ox, oy);
+ gdk_window_move(PWidget(id)->window, ox, oy);
#if 0
GtkAllocation alloc;
Modified: trunk/plugins/scintilla/scintilla/ScintillaGTK.cxx
==============================================================================
--- trunk/plugins/scintilla/scintilla/ScintillaGTK.cxx (original)
+++ trunk/plugins/scintilla/scintilla/ScintillaGTK.cxx Mon Mar 30 21:45:20 2009
@@ -992,7 +992,11 @@
if (timer.ticking != on) {
timer.ticking = on;
if (timer.ticking) {
+#if GLIB_MAJOR_VERSION < 2
timer.tickerID = reinterpret_cast<TickerID>(gtk_timeout_add(timer.tickSize, (GtkFunction)TimeOut, this));
+#else
+ timer.tickerID = reinterpret_cast<TickerID>(g_timeout_add(timer.tickSize, (GSourceFunc)TimeOut, this));
+#endif
} else {
gtk_timeout_remove(GPOINTER_TO_UINT(timer.tickerID));
}
Modified: trunk/plugins/scintilla/scintilla/include/ScintillaWidget.h
==============================================================================
--- trunk/plugins/scintilla/scintilla/include/ScintillaWidget.h (original)
+++ trunk/plugins/scintilla/scintilla/include/ScintillaWidget.h Mon Mar 30 21:45:20 2009
@@ -15,9 +15,9 @@
extern "C" {
#endif
-#define SCINTILLA(obj) GTK_CHECK_CAST (obj, scintilla_get_type (), ScintillaObject)
-#define SCINTILLA_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, scintilla_get_type (), ScintillaClass)
-#define IS_SCINTILLA(obj) GTK_CHECK_TYPE (obj, scintilla_get_type ())
+#define SCINTILLA(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, scintilla_get_type (), ScintillaObject)
+#define SCINTILLA_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, scintilla_get_type (), ScintillaClass)
+#define IS_SCINTILLA(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, scintilla_get_type ())
typedef struct _ScintillaObject ScintillaObject;
typedef struct _ScintillaClass ScintillaClass;
Modified: trunk/plugins/scintilla/style-editor.c
==============================================================================
--- trunk/plugins/scintilla/style-editor.c (original)
+++ trunk/plugins/scintilla/style-editor.c Mon Mar 30 21:45:20 2009
@@ -21,7 +21,10 @@
#endif
#include <ctype.h>
-#include <gnome.h>
+#include <stdlib.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
#include <glade/glade.h>
#include <libanjuta/anjuta-utils.h>
@@ -83,7 +86,7 @@
{
/* Widgets */
GtkWidget *dialog;
- GtkWidget *hilite_item_combo;
+ GtkWidget *hilite_item_combobox;
GtkWidget *font_picker;
GtkWidget *font_bold_check;
GtkWidget *font_italics_check;
@@ -562,7 +565,7 @@
}
static void
-on_hilite_style_entry_changed (GtkEditable * editable, gpointer user_data)
+on_hilite_style_entry_changed (GtkComboBox * combobox, gpointer user_data)
{
StyleEditor *p;
const gchar *style_item;
@@ -570,7 +573,7 @@
g_return_if_fail (user_data);
p = user_data;
- style_item = gtk_entry_get_text (GTK_ENTRY (editable));
+ style_item = gtk_combo_box_get_active_text (combobox);
if (!style_item || strlen (style_item) <= 0)
return;
if (p->priv->current_style)
@@ -689,15 +692,14 @@
style_data_set_item (sdata, hilite_style[i]);
g_object_set_data_full (G_OBJECT (se->priv->dialog),
hilite_style[i], sdata,
- (GtkDestroyNotify)style_data_destroy);
+ (GDestroyNotify)style_data_destroy);
}
se->priv->default_style =
- gtk_object_get_data (GTK_OBJECT (se->priv->dialog),
+ g_object_get_data (G_OBJECT (se->priv->dialog),
hilite_style[0]);
se->priv->current_style = NULL;
- on_hilite_style_entry_changed (GTK_EDITABLE (GTK_COMBO
- (se->priv->hilite_item_combo)->entry), se);
+ on_hilite_style_entry_changed (GTK_COMBO_BOX (se->priv->hilite_item_combobox), se);
str = sci_prop_get (se->props, CARET_FORE_COLOR);
if(str)
@@ -800,8 +802,7 @@
g_return_if_fail (se);
/* Sync the current item */
- on_hilite_style_entry_changed (GTK_EDITABLE (GTK_COMBO
- (se->priv->hilite_item_combo)->entry), se);
+ on_hilite_style_entry_changed (GTK_COMBO_BOX (se->priv->hilite_item_combobox), se);
/* Transfer to props */
for (i = 0;; i += 2)
@@ -811,7 +812,7 @@
if (hilite_style[i] == NULL)
break;
sdata =
- gtk_object_get_data (GTK_OBJECT (se->priv->dialog),
+ g_object_get_data (G_OBJECT (se->priv->dialog),
hilite_style[i]);
str = style_data_get_string (sdata);
if (str)
@@ -883,7 +884,6 @@
{
GladeXML *gxml;
GtkWidget *pref_dialog;
- GList *list = NULL;
gint i;
g_return_if_fail (se);
@@ -893,7 +893,7 @@
se->priv->dialog = glade_xml_get_widget (gxml, "style_editor_dialog");
gtk_widget_show (se->priv->dialog);
se->priv->font_picker = glade_xml_get_widget (gxml, "font");
- se->priv->hilite_item_combo = glade_xml_get_widget (gxml, "combo");
+ se->priv->hilite_item_combobox = glade_xml_get_widget (gxml, "comboBox");
se->priv->font_bold_check = glade_xml_get_widget (gxml, "bold");
se->priv->font_italics_check = glade_xml_get_widget (gxml, "italic");
se->priv->font_underlined_check = glade_xml_get_widget (gxml, "underlined");
@@ -912,17 +912,15 @@
{
if (hilite_style[i] == NULL)
break;
- list = g_list_append (list, hilite_style[i]);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (se->priv->hilite_item_combobox), hilite_style[i]);
+
}
- gtk_combo_set_popdown_strings (GTK_COMBO (se->priv->hilite_item_combo), list);
- g_list_free (list);
pref_dialog = anjuta_preferences_get_dialog (se->prefs);
gtk_window_set_transient_for (GTK_WINDOW (se->priv->dialog),
GTK_WINDOW (pref_dialog));
- g_signal_connect (G_OBJECT (GTK_COMBO(se->priv->hilite_item_combo)->entry),
- "changed", G_CALLBACK (on_hilite_style_entry_changed),
+ g_signal_connect (se->priv->hilite_item_combobox, "changed", G_CALLBACK (on_hilite_style_entry_changed),
se);
g_signal_connect (G_OBJECT (se->priv->font_use_default_check),
"toggled", G_CALLBACK (on_use_default_font_toggled),
Modified: trunk/plugins/scintilla/text-editor-iterable.c
==============================================================================
--- trunk/plugins/scintilla/text-editor-iterable.c (original)
+++ trunk/plugins/scintilla/text-editor-iterable.c Mon Mar 30 21:45:20 2009
@@ -23,6 +23,7 @@
#endif
#include <ctype.h>
+#include <stdlib.h>
#include <libanjuta/anjuta-utils.h>
#include <libanjuta/anjuta-debug.h>
#include <libanjuta/interfaces/ianjuta-iterable.h>
Modified: trunk/plugins/scintilla/text_editor.c
==============================================================================
--- trunk/plugins/scintilla/text_editor.c (original)
+++ trunk/plugins/scintilla/text_editor.c Mon Mar 30 21:45:20 2009
@@ -25,9 +25,11 @@
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
+#include <stdlib.h>
#include <ctype.h>
#include <gio/gio.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
#include <errno.h>
#include <libanjuta/resources.h>
Modified: trunk/plugins/scintilla/text_editor_cbs.c
==============================================================================
--- trunk/plugins/scintilla/text_editor_cbs.c (original)
+++ trunk/plugins/scintilla/text_editor_cbs.c Mon Mar 30 21:45:20 2009
@@ -20,7 +20,9 @@
# include <config.h>
#endif
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
#include <ctype.h>
#include <libanjuta/resources.h>
Modified: trunk/plugins/scintilla/text_editor_cbs.h
==============================================================================
--- trunk/plugins/scintilla/text_editor_cbs.h (original)
+++ trunk/plugins/scintilla/text_editor_cbs.h Mon Mar 30 21:45:20 2009
@@ -19,7 +19,8 @@
#ifndef _TEXT_EDITOR_CBS_H_
#define _TEXT_EDITOR_CBS_H_
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
#include "text_editor.h"
gboolean
Modified: trunk/plugins/search/plugin.c
==============================================================================
--- trunk/plugins/search/plugin.c (original)
+++ trunk/plugins/search/plugin.c Mon Mar 30 21:45:20 2009
@@ -23,7 +23,7 @@
#include <libanjuta/interfaces/ianjuta-document-manager.h>
#include <libanjuta/anjuta-shell.h>
#include <libanjuta/anjuta-debug.h>
-
+#include <glib/gi18n.h>
#include "plugin.h"
#include "search-replace.h"
#include "search-replace_backend.h"
Modified: trunk/plugins/search/plugin.h
==============================================================================
--- trunk/plugins/search/plugin.h (original)
+++ trunk/plugins/search/plugin.h Mon Mar 30 21:45:20 2009
@@ -18,7 +18,7 @@
#include <libanjuta/anjuta-plugin.h>
#include <libanjuta/anjuta-preferences.h>
#include <libanjuta/anjuta-ui.h>
-
+#include <glib/gi18n.h>
#include <libanjuta/interfaces/ianjuta-document-manager.h>
extern GType search_plugin_get_type(GTypeModule *module);
Modified: trunk/plugins/search/search-replace.c
==============================================================================
--- trunk/plugins/search/search-replace.c (original)
+++ trunk/plugins/search/search-replace.c Mon Mar 30 21:45:20 2009
@@ -21,7 +21,8 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <glade/glade.h>
#include <libanjuta/anjuta-utils.h>
Modified: trunk/plugins/search/search-replace_backend.c
==============================================================================
--- trunk/plugins/search/search-replace_backend.c (original)
+++ trunk/plugins/search/search-replace_backend.c Mon Mar 30 21:45:20 2009
@@ -37,7 +37,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
#include <glade/glade.h>
#include <libanjuta/anjuta-utils.h>
Modified: trunk/plugins/search/search-replace_backend.h
==============================================================================
--- trunk/plugins/search/search-replace_backend.h (original)
+++ trunk/plugins/search/search-replace_backend.h Mon Mar 30 21:45:20 2009
@@ -24,6 +24,7 @@
#include <libanjuta/interfaces/ianjuta-document-manager.h>
#include <libanjuta/interfaces/ianjuta-editor.h>
+#include <glib/gi18n.h>
/* Search expression options */
typedef struct _SearchExpression
Modified: trunk/plugins/search/search_preferences.c
==============================================================================
--- trunk/plugins/search/search_preferences.c (original)
+++ trunk/plugins/search/search_preferences.c Mon Mar 30 21:45:20 2009
@@ -30,9 +30,9 @@
#include <string.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
#include <gconf/gconf-client.h>
-
+#include <glib/gi18n.h>
#include "search-replace_backend.h"
#include "search-replace.h"
#include "search_preferences.h"
Modified: trunk/plugins/sourceview/anjuta-view.h
==============================================================================
--- trunk/plugins/sourceview/anjuta-view.h (original)
+++ trunk/plugins/sourceview/anjuta-view.h Mon Mar 30 21:45:20 2009
@@ -81,7 +81,7 @@
/*
* Public methods
*/
-GtkType anjuta_view_get_type (void) G_GNUC_CONST;
+GType anjuta_view_get_type (void) G_GNUC_CONST;
GtkWidget *anjuta_view_new (Sourceview *sv);
Modified: trunk/plugins/sourceview/assist-window.c
==============================================================================
--- trunk/plugins/sourceview/assist-window.c (original)
+++ trunk/plugins/sourceview/assist-window.c Mon Mar 30 21:45:20 2009
@@ -238,7 +238,7 @@
obj->priv->scrolled_window = scroll;
obj->priv->suggestions = GTK_TREE_MODEL(gtk_list_store_new(ASSIST_WINDOW_COLUMN_END,
- GTK_TYPE_STRING, GTK_TYPE_INT));
+ G_TYPE_STRING, G_TYPE_INT));
gtk_tree_view_set_model(obj->priv->view, obj->priv->suggestions);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes("Suggestions",
Modified: trunk/plugins/symbol-db/symbol-db-engine-core.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-engine-core.c (original)
+++ trunk/plugins/symbol-db/symbol-db-engine-core.c Mon Mar 30 21:45:20 2009
@@ -104,6 +104,7 @@
#include <time.h>
#include <unistd.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/mman.h>
#include <signal.h>
#include <fcntl.h> /* For O_* constants */
Modified: trunk/plugins/symbol-db/symbol-db-view-search.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-view-search.c (original)
+++ trunk/plugins/symbol-db/symbol-db-view-search.c Mon Mar 30 21:45:20 2009
@@ -539,7 +539,7 @@
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->hitlist), FALSE);
gtk_container_add (GTK_CONTAINER (list_sw), priv->hitlist);
- gtk_box_pack_end_defaults (GTK_BOX (search), frame);
+ gtk_box_pack_end (GTK_BOX (search), frame, TRUE, TRUE, 0);
gtk_widget_show_all (GTK_WIDGET (search));
}
Modified: trunk/plugins/terminal/terminal.c
==============================================================================
--- trunk/plugins/terminal/terminal.c (original)
+++ trunk/plugins/terminal/terminal.c Mon Mar 30 21:45:20 2009
@@ -28,7 +28,8 @@
#include <libanjuta/interfaces/ianjuta-terminal.h>
#include <libanjuta/interfaces/ianjuta-preferences.h>
#include <libanjuta/interfaces/ianjuta-project-manager.h>
-
+#include <sys/types.h>
+#include <unistd.h>
#include <signal.h>
#define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-terminal-plugin.ui"
Modified: trunk/plugins/tools/dialog.c
==============================================================================
--- trunk/plugins/tools/dialog.c (original)
+++ trunk/plugins/tools/dialog.c Mon Mar 30 21:45:20 2009
@@ -344,12 +344,12 @@
this->down_bt = glade_xml_get_widget(xml, TOOL_DOWN_BUTTON);
/* Connect all signals */
- glade_xml_signal_connect_data (xml, TOOL_ADD_SIGNAL, GTK_SIGNAL_FUNC (on_tool_add), this);
- glade_xml_signal_connect_data (xml, TOOL_ACTIVATED_SIGNAL, GTK_SIGNAL_FUNC (on_tool_activated), this);
- glade_xml_signal_connect_data (xml, TOOL_EDIT_SIGNAL, GTK_SIGNAL_FUNC (on_tool_edit), this);
- glade_xml_signal_connect_data (xml, TOOL_DELETE_SIGNAL, GTK_SIGNAL_FUNC (on_tool_delete), this);
- glade_xml_signal_connect_data (xml, TOOL_UP_SIGNAL, GTK_SIGNAL_FUNC (on_tool_up), this);
- glade_xml_signal_connect_data (xml, TOOL_DOWN_SIGNAL, GTK_SIGNAL_FUNC (on_tool_down), this);
+ glade_xml_signal_connect_data (xml, TOOL_ADD_SIGNAL, G_CALLBACK (on_tool_add), this);
+ glade_xml_signal_connect_data (xml, TOOL_ACTIVATED_SIGNAL, G_CALLBACK (on_tool_activated), this);
+ glade_xml_signal_connect_data (xml, TOOL_EDIT_SIGNAL, G_CALLBACK (on_tool_edit), this);
+ glade_xml_signal_connect_data (xml, TOOL_DELETE_SIGNAL, G_CALLBACK (on_tool_delete), this);
+ glade_xml_signal_connect_data (xml, TOOL_UP_SIGNAL, G_CALLBACK (on_tool_up), this);
+ glade_xml_signal_connect_data (xml, TOOL_DOWN_SIGNAL, G_CALLBACK (on_tool_down), this);
selection = gtk_tree_view_get_selection (this->view);
this->changed_sig = g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (on_tool_selection_changed), this);
Modified: trunk/plugins/tools/editor.c
==============================================================================
--- trunk/plugins/tools/editor.c (original)
+++ trunk/plugins/tools/editor.c Mon Mar 30 21:45:20 2009
@@ -25,7 +25,8 @@
*---------------------------------------------------------------------------*/
#include <config.h>
-
+#include <errno.h>
+#include <sys/stat.h>
#include "editor.h"
#include "dialog.h"
@@ -36,9 +37,13 @@
#include <libanjuta/interfaces/ianjuta-document-manager.h>
#include <libanjuta/interfaces/ianjuta-editor.h>
#include <libanjuta/interfaces/ianjuta-file-loader.h>
-
+#include <glib.h>
+#include <gdk/gdk.h>
#include <gtk/gtk.h>
-
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <gnome.h>
#include <string.h>
/*---------------------------------------------------------------------------*/
@@ -463,8 +468,8 @@
atp_variable_dialog_populate (this, flag);
/* Connect all signals */
- glade_xml_signal_connect_data (xml, VARIABLE_RESPONSE_SIGNAL, GTK_SIGNAL_FUNC (on_variable_response), this);
- glade_xml_signal_connect_data (xml, VARIABLE_ACTIVATE_SIGNAL, GTK_SIGNAL_FUNC (on_variable_activate), this);
+ glade_xml_signal_connect_data (xml, VARIABLE_RESPONSE_SIGNAL, G_CALLBACK (on_variable_response), this);
+ glade_xml_signal_connect_data (xml, VARIABLE_ACTIVATE_SIGNAL, G_CALLBACK (on_variable_activate), this);
g_signal_connect (G_OBJECT (this->dialog), "delete_event", G_CALLBACK (gtk_widget_hide_on_delete), NULL);
g_object_unref (xml);
@@ -1012,14 +1017,14 @@
atp_update_sensitivity (this);
/* Connect all signals */
- glade_xml_signal_connect_data (xml, EDITOR_RESPONSE_SIGNAL, GTK_SIGNAL_FUNC (on_editor_response), this);
- glade_xml_signal_connect_data (xml, EDITOR_PARAM_VARIABLE_SIGNAL, GTK_SIGNAL_FUNC (on_editor_param_variable_show), this);
- glade_xml_signal_connect_data (xml, EDITOR_DIR_VARIABLE_SIGNAL, GTK_SIGNAL_FUNC (on_editor_dir_variable_show), this);
- glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_SHORCUT_SIGNAL, GTK_SIGNAL_FUNC (on_editor_shortcut_toggle), this);
- glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_TERMINAL_SIGNAL, GTK_SIGNAL_FUNC (on_editor_terminal_toggle), this);
- glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_SCRIPT_SIGNAL, GTK_SIGNAL_FUNC (on_editor_script_toggle), this);
- glade_xml_signal_connect_data (xml, EDITOR_INPUT_VARIABLE_SIGNAL, GTK_SIGNAL_FUNC (on_editor_input_variable_show), this);
- glade_xml_signal_connect_data (xml, EDITOR_INPUT_CHANGED_SIGNAL, GTK_SIGNAL_FUNC (on_editor_input_changed), this);
+ glade_xml_signal_connect_data (xml, EDITOR_RESPONSE_SIGNAL, G_CALLBACK (on_editor_response), this);
+ glade_xml_signal_connect_data (xml, EDITOR_PARAM_VARIABLE_SIGNAL, G_CALLBACK (on_editor_param_variable_show), this);
+ glade_xml_signal_connect_data (xml, EDITOR_DIR_VARIABLE_SIGNAL, G_CALLBACK (on_editor_dir_variable_show), this);
+ glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_SHORCUT_SIGNAL, G_CALLBACK (on_editor_shortcut_toggle), this);
+ glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_TERMINAL_SIGNAL, G_CALLBACK (on_editor_terminal_toggle), this);
+ glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_SCRIPT_SIGNAL, G_CALLBACK (on_editor_script_toggle), this);
+ glade_xml_signal_connect_data (xml, EDITOR_INPUT_VARIABLE_SIGNAL, G_CALLBACK (on_editor_input_variable_show), this);
+ glade_xml_signal_connect_data (xml, EDITOR_INPUT_CHANGED_SIGNAL, G_CALLBACK (on_editor_input_changed), this);
g_object_unref (xml);
Modified: trunk/plugins/tools/execute.c
==============================================================================
--- trunk/plugins/tools/execute.c (original)
+++ trunk/plugins/tools/execute.c Mon Mar 30 21:45:20 2009
@@ -35,9 +35,11 @@
#include <libanjuta/interfaces/ianjuta-editor-selection.h>
#include <libanjuta/interfaces/ianjuta-file-savable.h>
#include <libanjuta/interfaces/ianjuta-file-loader.h>
+#include <libgnome/libgnome.h>
#include <glib.h>
-
+#include <stdlib.h>
+#include <unistd.h>
#include <ctype.h>
/*---------------------------------------------------------------------------*/
Modified: trunk/plugins/valgrind/vggeneralprefs.h
==============================================================================
--- trunk/plugins/valgrind/vggeneralprefs.h (original)
+++ trunk/plugins/valgrind/vggeneralprefs.h Mon Mar 30 21:45:20 2009
@@ -25,7 +25,7 @@
#ifndef __VG_GENERAL_PREFS_H__
#define __VG_GENERAL_PREFS_H__
-#include <libgnomeui/gnome-file-entry.h>
+#include <gtk/gtk.h>
#include "vgtoolprefs.h"
Modified: trunk/plugins/valgrind/vghelgrindprefs.c
==============================================================================
--- trunk/plugins/valgrind/vghelgrindprefs.c (original)
+++ trunk/plugins/valgrind/vghelgrindprefs.c Mon Mar 30 21:45:20 2009
@@ -47,6 +47,11 @@
static VgToolPrefsClass *parent_class = NULL;
+enum {
+ COLUMN_STRING,
+ COLUMN_INT,
+ N_COLUMNS
+};
GType
vg_helgrind_prefs_get_type (void)
@@ -105,14 +110,19 @@
}
static void
-menu_item_activated (GtkMenuItem *item, const char *key)
+menu_item_activated (GtkComboBox *widget, const char *key)
{
GConfClient *gconf;
const char *str;
+ gint i;
+ GtkTreeIter iter;
gconf = gconf_client_get_default ();
+
+ gtk_combo_box_get_active_iter (widget, &iter);
+ gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, COLUMN_INT, &i, -1);
- str = g_object_get_data (G_OBJECT (item), "value");
+ str = GINT_TO_POINTER (i);
gconf_client_set_string (gconf, key, str, NULL);
g_object_unref (gconf);
@@ -123,30 +133,35 @@
static GtkWidget *
show_last_access_new (GConfClient *gconf)
{
- GtkWidget *omenu, *menu, *item;
+ GtkListStore *list_store;
+ GtkWidget *omenu;
int history = 0;
char *str;
int i;
+ GtkTreeIter iter;
+ GtkCellRenderer *cell;
+
+ list_store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
+
str = gconf_client_get_string (gconf, SHOW_LAST_ACCESS_KEY, NULL);
- menu = gtk_menu_new ();
for (i = 0; i < 3; i++) {
if (str && !strcmp (show_last_access_opts[i], str))
history = i;
- item = gtk_menu_item_new_with_label (show_last_access_opts[i]);
- g_object_set_data (G_OBJECT (item), "value", show_last_access_opts[i]);
- g_signal_connect (item, "activate", G_CALLBACK (menu_item_activated), SHOW_LAST_ACCESS_KEY);
- gtk_widget_show (item);
-
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COLUMN_STRING, show_last_access_opts[i], COLUMN_INT, GPOINTER_TO_INT (g_strdup (show_last_access_opts[i])), -1);
}
-
- gtk_widget_show (menu);
- omenu = gtk_option_menu_new ();
- gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
- gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), history);
+
+ omenu = gtk_combo_box_new_with_model(GTK_TREE_MODEL(list_store));
+
+ cell = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(omenu), cell, TRUE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(omenu), cell, "text", 0, NULL);
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (omenu), history);
+ g_signal_connect (omenu, "changed", G_CALLBACK (menu_item_activated), SHOW_LAST_ACCESS_KEY);
g_free (str);
@@ -181,7 +196,7 @@
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
widget = show_last_access_new (gconf);
- prefs->show_last_access = GTK_OPTION_MENU (widget);
+ prefs->show_last_access = GTK_COMBO_BOX (widget);
gtk_widget_show (widget);
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
Modified: trunk/plugins/valgrind/vghelgrindprefs.h
==============================================================================
--- trunk/plugins/valgrind/vghelgrindprefs.h (original)
+++ trunk/plugins/valgrind/vghelgrindprefs.h Mon Mar 30 21:45:20 2009
@@ -45,7 +45,7 @@
VgToolPrefs parent_object;
GtkToggleButton *private_stacks;
- GtkOptionMenu *show_last_access;
+ GtkComboBox *show_last_access;
};
struct _VgHelgrindPrefsClass {
Modified: trunk/plugins/valgrind/vgmemcheckprefs.c
==============================================================================
--- trunk/plugins/valgrind/vgmemcheckprefs.c (original)
+++ trunk/plugins/valgrind/vgmemcheckprefs.c Mon Mar 30 21:45:20 2009
@@ -52,6 +52,11 @@
static VgToolPrefsClass *parent_class = NULL;
+enum {
+ COLUMN_STRING,
+ COLUMN_INT,
+ N_COLUMNS
+};
GType
vg_memcheck_prefs_get_type (void)
@@ -110,14 +115,20 @@
}
static void
-menu_item_activated (GtkMenuItem *item, const char *key)
+menu_item_activated (GtkComboBox *widget, const char *key)
{
+ int i = 0;
GConfClient *gconf;
const char *str;
+ GtkTreeIter iter;
gconf = gconf_client_get_default ();
-
- str = g_object_get_data (G_OBJECT (item), "value");
+
+ gtk_combo_box_get_active_iter (widget, &iter);
+ gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, 1, &i, -1);
+
+ str = GINT_TO_POINTER (i);
+
gconf_client_set_string (gconf, key, str, NULL);
g_object_unref (gconf);
@@ -140,32 +151,36 @@
}
static GtkWidget *
-option_menu_new (GConfClient *gconf, char *key, char **values, int n, int def)
+combo_box_new (GConfClient *gconf, char *key, char **values, int n, int def)
{
- GtkWidget *omenu, *menu, *item;
+ GtkListStore *list_store;
+ GtkWidget *omenu;
+ GtkTreeIter iter;
+ GtkCellRenderer *cell;
int history = def;
char *str;
int i;
+
+ list_store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
str = gconf_client_get_string (gconf, key, NULL);
- menu = gtk_menu_new ();
for (i = 0; i < n; i++) {
if (str && !strcmp (values[i], str))
history = i;
- item = gtk_menu_item_new_with_label (_(values[i]));
- g_object_set_data (G_OBJECT (item), "value", _(values[i]));
- g_signal_connect (item, "activate", G_CALLBACK (menu_item_activated), key);
- gtk_widget_show (item);
-
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COLUMN_STRING, _(values[i]), COLUMN_INT, GPOINTER_TO_INT (g_strdup (_(values[i]))), -1);
}
- gtk_widget_show (menu);
- omenu = gtk_option_menu_new ();
- gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
- gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), history);
+ omenu = gtk_combo_box_new_with_model(GTK_TREE_MODEL(list_store));
+
+ cell = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(omenu), cell, TRUE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(omenu), cell, "text", 0, NULL);
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (omenu), history);
+ g_signal_connect (omenu, "changed", G_CALLBACK (menu_item_activated), key);
g_free (str);
@@ -199,8 +214,8 @@
label = gtk_label_new (_("Leak check:"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- widget = option_menu_new (gconf, LEAK_CHECK_KEY, leak_checks, G_N_ELEMENTS (leak_checks), 1);
- prefs->leak_check = GTK_OPTION_MENU (widget);
+ widget = combo_box_new (gconf, LEAK_CHECK_KEY, leak_checks, G_N_ELEMENTS (leak_checks), 1);
+ prefs->leak_check = GTK_COMBO_BOX (widget);
gtk_widget_show (widget);
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
gtk_widget_show (hbox);
@@ -218,8 +233,8 @@
label = gtk_label_new (_("Leak resolution:"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- widget = option_menu_new (gconf, LEAK_RESOLUTION_KEY, leak_resolutions, G_N_ELEMENTS (leak_resolutions), 0);
- prefs->leak_resolution = GTK_OPTION_MENU (widget);
+ widget = combo_box_new (gconf, LEAK_RESOLUTION_KEY, leak_resolutions, G_N_ELEMENTS (leak_resolutions), 0);
+ prefs->leak_resolution = GTK_COMBO_BOX (widget);
gtk_widget_show (widget);
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
gtk_widget_show (hbox);
Modified: trunk/plugins/valgrind/vgmemcheckprefs.h
==============================================================================
--- trunk/plugins/valgrind/vgmemcheckprefs.h (original)
+++ trunk/plugins/valgrind/vgmemcheckprefs.h Mon Mar 30 21:45:20 2009
@@ -44,9 +44,9 @@
struct _VgMemcheckPrefs {
VgToolPrefs parent_object;
- GtkOptionMenu *leak_check;
+ GtkComboBox *leak_check;
GtkToggleButton *show_reachable;
- GtkOptionMenu *leak_resolution;
+ GtkComboBox *leak_resolution;
GtkSpinButton *freelist_vol;
GtkToggleButton *workaround_gcc296_bugs;
GtkToggleButton *avoid_strlen_errors;
Modified: trunk/plugins/valgrind/vgrule-editor.c
==============================================================================
--- trunk/plugins/valgrind/vgrule-editor.c (original)
+++ trunk/plugins/valgrind/vgrule-editor.c Mon Mar 30 21:45:20 2009
@@ -46,6 +46,12 @@
static GtkVBoxClass *parent_class = NULL;
+enum {
+ COLUMN_STRING,
+ COLUMN_INT,
+ N_COLUMNS
+};
+
GType
vg_rule_editor_get_type (void)
@@ -85,36 +91,42 @@
static void
-type_menu_changed (GtkMenuItem *item, gpointer user_data)
+type_menu_changed (GtkComboBox *widget, gpointer user_data)
{
VgRuleEditor *editor = user_data;
vgrule_t type;
+ GtkTreeIter iter;
- type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "vgrule_t"));
-
+ gtk_combo_box_get_active_iter (widget, &iter);
+ gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, 1, &type, -1);
+
gtk_widget_set_sensitive (GTK_WIDGET (editor->syscall), type == VG_RULE_PARAM);
}
static GtkWidget *
rule_type_menu_new (VgRuleEditor *editor)
{
- GtkWidget *omenu, *menu, *item;
+ GtkListStore *list_store;
+ GtkWidget *omenu;
int i;
-
- omenu = gtk_option_menu_new ();
- menu = gtk_menu_new ();
+ GtkTreeIter iter;
+ GtkCellRenderer *cell;
+
+ list_store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
for (i = 0; i < VG_RULE_LAST; i++) {
- item = gtk_menu_item_new_with_label (vg_rule_type_to_name (i));
- g_object_set_data (G_OBJECT (item), "vgrule_t", GINT_TO_POINTER (i));
- g_signal_connect (item, "activate", G_CALLBACK (type_menu_changed), editor);
- gtk_widget_show (item);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- editor->types[i] = item;
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COLUMN_STRING, vg_rule_type_to_name (i), COLUMN_INT, i, -1);
}
-
- gtk_widget_show (menu);
- gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
+
+ omenu = gtk_combo_box_new_with_model(GTK_TREE_MODEL(list_store));
+
+ cell = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(omenu), cell, TRUE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(omenu), cell, "text", 0, NULL);
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (omenu), 0);
+ g_signal_connect (omenu, "changed", G_CALLBACK (type_menu_changed), editor);
return omenu;
}
@@ -122,27 +134,27 @@
static GtkWidget *
call_stack_frame_new (vgcaller_t type, const char *name)
{
+ GtkListStore *list_store;
GtkWidget *hbox, *omenu, *entry;
- GtkWidget *menu, *item;
-
+ GtkTreeIter iter;
+ GtkCellRenderer *cell;
+
hbox = gtk_hbox_new (FALSE, 6);
+ list_store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
+
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COLUMN_STRING, _("Function"), COLUMN_INT, VG_CALLER_FUNCTION, -1);
+
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COLUMN_STRING, _("Shared Object"), COLUMN_INT, VG_CALLER_OBJECT, -1);
+
+ omenu = gtk_combo_box_new_with_model(GTK_TREE_MODEL(list_store));
+
+ cell = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(omenu), cell, TRUE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(omenu), cell, "text", 0, NULL);
- omenu = gtk_option_menu_new ();
- menu = gtk_menu_new ();
-
- item = gtk_menu_item_new_with_label (_("Function"));
- gtk_widget_show (item);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- g_object_set_data (G_OBJECT (item), "vgcaller_t", GINT_TO_POINTER (VG_CALLER_FUNCTION));
-
- item = gtk_menu_item_new_with_label (_("Shared Object"));
- gtk_widget_show (item);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- g_object_set_data (G_OBJECT (item), "vgcaller_t", GINT_TO_POINTER (VG_CALLER_OBJECT));
-
- gtk_widget_show (menu);
- gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
- gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), (int) type);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (omenu), (int) type);
gtk_widget_show (omenu);
gtk_box_pack_start (GTK_BOX (hbox), omenu, FALSE, FALSE, 0);
@@ -237,7 +249,7 @@
label = gtk_label_new (_("Suppress messages of type:"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- editor->type = GTK_OPTION_MENU (widget = rule_type_menu_new (editor));
+ editor->type = GTK_COMBO_BOX (widget = rule_type_menu_new (editor));
gtk_widget_show (widget);
gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
gtk_widget_show (hbox);
@@ -444,8 +456,7 @@
void
vg_rule_editor_set_type (VgRuleEditor *editor, vgrule_t type)
{
- gtk_option_menu_set_history (editor->type, (int) type);
- g_signal_emit_by_name (editor->types[type], "activate", editor);
+ gtk_combo_box_set_active (editor->type, (int) type);
}
void
@@ -477,7 +488,7 @@
int type, i;
name = gtk_entry_get_text (editor->name);
- type = gtk_option_menu_get_history (editor->type);
+ type = gtk_combo_box_get_active (editor->type);
rule = vg_rule_new (type, name);
if (type == VG_RULE_PARAM)
@@ -502,7 +513,7 @@
entry = g_object_get_data (G_OBJECT (editor->callers->pdata[i]), "entry");
name = gtk_entry_get_text (GTK_ENTRY (entry));
- type = gtk_option_menu_get_history (GTK_OPTION_MENU (omenu));
+ type = gtk_combo_box_get_active (GTK_COMBO_BOX (omenu));
caller = vg_caller_new (type, name);
tail->next = caller;
Modified: trunk/plugins/valgrind/vgrule-editor.h
==============================================================================
--- trunk/plugins/valgrind/vgrule-editor.h (original)
+++ trunk/plugins/valgrind/vgrule-editor.h Mon Mar 30 21:45:20 2009
@@ -48,8 +48,7 @@
GtkVBox parent_object;
GtkEntry *name;
- GtkOptionMenu *type;
- GtkWidget *types[VG_RULE_LAST];
+ GtkComboBox *type;
GtkEntry *syscall;
GtkToggleButton *addrcheck;
Modified: trunk/plugins/valgrind/vgsearchbar.c
==============================================================================
--- trunk/plugins/valgrind/vgsearchbar.c (original)
+++ trunk/plugins/valgrind/vgsearchbar.c Mon Mar 30 21:45:20 2009
@@ -36,6 +36,12 @@
LAST_SIGNAL
};
+enum {
+ COLUMN_STRING,
+ COLUMN_INT,
+ N_COLUMNS
+};
+
static int search_bar_signals[LAST_SIGNAL] = { 0, };
@@ -119,7 +125,7 @@
clear_clicked (GtkWidget *widget, VgSearchBar *bar)
{
gtk_entry_set_text (bar->entry, "");
- gtk_option_menu_set_history (bar->menu, 0);
+ gtk_combo_box_set_active (bar->menu, 0);
g_signal_emit (bar, search_bar_signals[CLEAR], 0);
}
@@ -132,7 +138,7 @@
bar->item_id = -1;
- bar->menu = GTK_OPTION_MENU (widget = gtk_option_menu_new ());
+ bar->menu = GTK_COMBO_BOX (widget = gtk_combo_box_new ());
gtk_widget_show (widget);
gtk_box_pack_start (GTK_BOX (bar), widget, FALSE, FALSE, 0);
@@ -168,34 +174,42 @@
static void
-item_activate (GtkMenuItem *item, VgSearchBar *bar)
+item_activate (GtkComboBox *widget, VgSearchBar *bar)
{
- bar->item_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "item_id"));
+ GtkTreeIter iter;
+
+ gtk_combo_box_get_active_iter (widget, &iter);
+ gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, 1, &bar->item_id, -1);
}
static void
search_bar_set_menu_items (VgSearchBar *bar, VgSearchBarItem *items)
{
- GtkWidget *menu, *item;
+ GtkTreeIter iter;
+ GtkCellRenderer *cell;
+ GtkListStore *list_store;
int i;
-
+
g_return_if_fail (VG_IS_SEARCH_BAR (bar));
g_return_if_fail (items != NULL);
-
- menu = gtk_menu_new ();
+
+ list_store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
+
bar->item_id = items->id;
-
+
for (i = 0; items[i].label != NULL; i++) {
- item = gtk_menu_item_new_with_label (_(items[i].label));
- g_object_set_data (G_OBJECT (item), "item_id", GINT_TO_POINTER (items[i].id));
- g_signal_connect (item, "activate", G_CALLBACK (item_activate), bar);
- gtk_widget_show (item);
-
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COLUMN_STRING, _(items[i].label), COLUMN_INT, items[i].id, -1);
}
- gtk_option_menu_set_menu (bar->menu, menu);
- gtk_option_menu_set_history (bar->menu, 0);
+ gtk_combo_box_set_model (bar->menu, GTK_TREE_MODEL (list_store));
+
+ cell = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(bar->menu), cell, TRUE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(bar->menu), cell, "text", 0, NULL);
+
+ g_signal_connect (bar->menu, "changed", G_CALLBACK (item_activate), bar);
+ gtk_combo_box_set_active (bar->menu, 0);
}
Modified: trunk/plugins/valgrind/vgsearchbar.h
==============================================================================
--- trunk/plugins/valgrind/vgsearchbar.h (original)
+++ trunk/plugins/valgrind/vgsearchbar.h Mon Mar 30 21:45:20 2009
@@ -49,7 +49,7 @@
struct _VgSearchBar {
GtkHBox parent_object;
- GtkOptionMenu *menu;
+ GtkComboBox *menu;
GtkEntry *entry;
GtkWidget *clear;
Modified: trunk/src/about.c
==============================================================================
--- trunk/src/about.c (original)
+++ trunk/src/about.c Mon Mar 30 21:45:20 2009
@@ -23,6 +23,7 @@
#endif
#include <gtk/gtk.h>
+#include <stdlib.h>
#include <libanjuta/anjuta-plugin-manager.h>
#include "about.h"
@@ -251,7 +252,7 @@
authors_v = g_strsplit(authors, ",", -1);
}
dialog = gtk_about_dialog_new();
- gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(dialog), name);
+ gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(dialog), name);
gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), VERSION);
if (license)
gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(dialog),
Modified: trunk/src/action-callbacks.h
==============================================================================
--- trunk/src/action-callbacks.h (original)
+++ trunk/src/action-callbacks.h Mon Mar 30 21:45:20 2009
@@ -20,7 +20,7 @@
#ifndef _MAINMENU_CALLBACKS_H_
#define _MAINMENU_CALLBACKS_H_
-#include <gnome.h>
+#include <gtk/gtk.h>
void on_exit1_activate (GtkAction * action, AnjutaApp *app);
void on_fullscreen_toggle (GtkAction *action, AnjutaApp *app);
Modified: trunk/src/anjuta-app.c
==============================================================================
--- trunk/src/anjuta-app.c (original)
+++ trunk/src/anjuta-app.c Mon Mar 30 21:45:20 2009
@@ -914,7 +914,7 @@
menuitem = GTK_CHECK_MENU_ITEM (gtk_check_menu_item_new_with_label (title));
gtk_widget_show (GTK_WIDGET (menuitem));
gtk_check_menu_item_set_active (menuitem, TRUE);
- gtk_menu_append (GTK_MENU (app->view_menu), GTK_WIDGET (menuitem));
+ gtk_menu_shell_append (GTK_MENU_SHELL (app->view_menu), GTK_WIDGET (menuitem));
if (locked)
g_object_set( G_OBJECT(menuitem), "visible", FALSE, NULL);
Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c (original)
+++ trunk/src/main.c Mon Mar 30 21:45:20 2009
@@ -27,13 +27,13 @@
#endif
#include <sys/stat.h>
+#include <stdlib.h>
#include <gtk/gtk.h>
#include <unique/unique.h>
#include <libanjuta/resources.h>
#include <libanjuta/anjuta-debug.h>
#include <libanjuta/interfaces/ianjuta-file-loader.h>
-#include <gnome.h>
#include "anjuta.h"
@@ -164,15 +164,8 @@
g_option_context_add_main_entries (context, anjuta_options, NULL);
#endif
- /* gnome_program_init() does this for us - enable when it's removed */
- /* g_option_context_add_group (context, gtk_get_option_group (TRUE));*/
- /* Init Gnome - remove once we get rid of libgnome */
- gnome_program_init (PACKAGE, VERSION,
- LIBGNOMEUI_MODULE, argc, argv,
- GNOME_PARAM_GOPTION_CONTEXT, context,
- GNOME_PARAM_HUMAN_READABLE_NAME,
- _("Integrated Development Environment"),
- GNOME_PARAM_NONE);
+ g_option_context_add_group (context, gtk_get_option_group (TRUE));
+ gtk_init (&argc, &argv);
/* Initialize threads, if possible */
#ifdef G_THREADS_ENABLED
Modified: trunk/src/shell.c
==============================================================================
--- trunk/src/shell.c (original)
+++ trunk/src/shell.c Mon Mar 30 21:45:20 2009
@@ -24,7 +24,7 @@
#include <libanjuta/anjuta-shell.h>
#include <libanjuta/anjuta-utils.h>
#include <libanjuta/anjuta-debug.h>
-
+#include <gnome.h>
#include "shell.h"
#define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-shell.ui"
@@ -76,7 +76,7 @@
win = gtk_dialog_new_with_buttons (_("Anjuta Plugins"), GTK_WINDOW (shell),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CLOSE, GTK_STOCK_CANCEL, NULL);
- gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG(win)->vbox), accel_editor);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG(win)->vbox), accel_editor, TRUE, TRUE, 0);
gtk_window_set_default_size (GTK_WINDOW (win), 500, 400);
gtk_dialog_run (GTK_DIALOG (win));
gtk_widget_destroy (win);
@@ -163,7 +163,7 @@
g_list_free (plugins_dirs);
plugins = anjuta_plugin_manager_get_plugins_page (shell->plugin_manager);
- gtk_box_pack_end_defaults (GTK_BOX (shell->box), plugins);
+ gtk_box_pack_end (GTK_BOX (shell->box), plugins, TRUE, TRUE, 0);
/* Preferencesnces */
shell->preferences = ANJUTA_PREFERENCES (anjuta_preferences_new (shell->plugin_manager));
Modified: trunk/src/start-with.c
==============================================================================
--- trunk/src/start-with.c (original)
+++ trunk/src/start-with.c Mon Mar 30 21:45:20 2009
@@ -29,7 +29,7 @@
on_application_wizard_clicked (GtkButton *button, gpointer data)
{
GtkWidget *dialog = GTK_WIDGET (data);
- gtk_signal_emit_by_name (GTK_OBJECT (app->menubar.file.new_project),
+ g_signal_emit_by_name (G_OBJECT (app->menubar.file.new_project),
"activate", NULL);
gtk_widget_destroy (dialog);
}
@@ -38,7 +38,7 @@
on_import_wizard_clicked (GtkButton *button, gpointer data)
{
GtkWidget *dialog = GTK_WIDGET (data);
- gtk_signal_emit_by_name (GTK_OBJECT (app->menubar.file.import_project),
+ g_signal_emit_by_name (G_OBJECT (app->menubar.file.import_project),
"activate", NULL);
gtk_widget_destroy (dialog);
}
@@ -47,7 +47,7 @@
on_open_project_clicked (GtkButton *button, gpointer data)
{
GtkWidget *dialog = GTK_WIDGET (data);
- gtk_signal_emit_by_name (GTK_OBJECT (app->menubar.file.open_project),
+ g_signal_emit_by_name (G_OBJECT (app->menubar.file.open_project),
"activate", NULL);
gtk_widget_destroy (dialog);
}
@@ -72,7 +72,7 @@
on_open_file_clicked (GtkButton *button, gpointer data)
{
GtkWidget *dialog = GTK_WIDGET (data);
- gtk_signal_emit_by_name (GTK_OBJECT (app->menubar.file.open_file),
+ g_signal_emit_by_name (G_OBJECT (app->menubar.file.open_file),
"activate", NULL);
gtk_widget_destroy (dialog);
}
@@ -81,7 +81,7 @@
on_new_file_clicked (GtkButton *button, gpointer data)
{
GtkWidget *dialog = GTK_WIDGET (data);
- gtk_signal_emit_by_name (GTK_OBJECT (app->menubar.file.new_file),
+ g_signal_emit_by_name (G_OBJECT (app->menubar.file.new_file),
"activate", NULL);
gtk_widget_destroy (dialog);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
