[anjuta] Initial port to gtk+-3.0
- From: Johannes Schmid <jhs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta] Initial port to gtk+-3.0
- Date: Wed, 3 Nov 2010 11:34:10 +0000 (UTC)
commit 0c70711b75dfc745ab5309ea51191ffb1ddb6199
Author: Johannes Schmid <jhs gnome org>
Date: Fri Oct 29 12:34:57 2010 +0200
Initial port to gtk+-3.0
Basic stuff works again, some plugins are disabled, introspection is broken and the git plugin
doesn't seem to work correctly.
.gitignore | 67 +++++++++++++++++-
Makefile.am | 2 +-
configure.ac | 8 +-
libanjuta/Makefile.am | 50 +++++++-------
libanjuta/anjuta-plugin-manager.c | 2 +-
libanjuta/anjuta-tabber.c | 74 ++++++++++++++++----
libanjuta/anjuta-utils.c | 5 +-
libanjuta/cell-renderer-captioned-image.c | 19 ++---
libanjuta/e-splash.c | 22 ++----
libanjuta/interfaces/Makefile.am.iface | 6 +-
.../{libanjuta-1.0.pc.in => libanjuta-3.0.pc.in} | 8 +-
plugins/Makefile.am | 3 -
.../anjuta-build-basic-autotools-plugin.ui | 3 +-
plugins/build-basic-autotools/build-options.c | 6 +-
plugins/class-gen/combo-flags.c | 10 ++--
plugins/class-gen/window.c | 2 +-
plugins/debug-manager/chunk_view.c | 2 -
plugins/debug-manager/data_view.c | 54 ++++++--------
plugins/debug-manager/sharedlib.c | 6 +-
plugins/debug-manager/signals.c | 6 +-
plugins/debug-manager/sparse_view.c | 55 ++++++++-------
plugins/debug-manager/start.c | 6 +-
plugins/document-manager/plugin.c | 24 +++---
plugins/document-manager/search-box.c | 52 +++++++-------
plugins/file-loader/plugin.c | 14 ++--
plugins/file-manager/file-view.c | 2 +-
plugins/gbf-am/gbf-am-properties.h | 2 +-
plugins/gdb/preferences.c | 4 +-
plugins/git/anjuta-git.ui | 2 -
plugins/git/git-log-dialog.c | 2 +-
plugins/git/git-ui-utils.c | 1 -
plugins/message-view/anjuta-msgman.c | 33 +--------
plugins/message-view/message-view.c | 4 +-
plugins/message-view/plugin.c | 5 +-
plugins/project-manager/gbf-project-view.c | 27 +++----
plugins/project-wizard/druid.c | 2 +-
plugins/project-wizard/property.c | 4 +-
plugins/run-program/anjuta-run-program.ui | 14 +---
plugins/run-program/execute.c | 1 -
plugins/run-program/parameters.c | 4 +-
plugins/search/anjuta-search.ui | 22 ++++--
plugins/search/search-replace.c | 12 ++--
plugins/snippets-manager/plugin.c | 28 ++++----
plugins/snippets-manager/snippets-browser.c | 44 ++++++------
plugins/snippets-manager/snippets-editor.c | 30 ++++----
plugins/sourceview/anjuta-view.c | 30 ++++----
plugins/sourceview/assist-tip.c | 2 +-
plugins/sourceview/sourceview-prefs.c | 5 +-
plugins/starter/starter.c | 21 ++----
plugins/subversion/subversion-commit-dialog.c | 4 +-
plugins/subversion/subversion-log-dialog.c | 2 +-
plugins/symbol-db/symbol-db-model.h | 2 +-
plugins/symbol-db/symbol-db-views.c | 2 +-
plugins/terminal/terminal.c | 39 +----------
plugins/tools/editor.c | 20 +++---
src/Makefile.am | 5 +-
src/anjuta-app.c | 24 +++---
57 files changed, 459 insertions(+), 446 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a92530c..fd6cf14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,14 +36,79 @@
/intltool-update
/intltool-update.in
/libtool
-/po/*.gmo
/po/*.mo
/po/.intltool-merge-cache
/po/Makefile
/po/Makefile.in
/po/Makefile.in.in
/po/POTFILES
+/po/ar.gmo
+/po/az.gmo
+/po/be.gmo
+/po/be latin gmo
+/po/bg.gmo
+/po/ca.gmo
+/po/ca valencia gmo
+/po/cs.gmo
+/po/da.gmo
+/po/de.gmo
+/po/dz.gmo
+/po/el.gmo
+/po/en shaw gmo
+/po/en_CA.gmo
+/po/en_GB.gmo
+/po/es.gmo
+/po/eu.gmo
+/po/fi.gmo
+/po/fr.gmo
+/po/ga.gmo
+/po/gl.gmo
+/po/gu.gmo
+/po/he.gmo
+/po/hi.gmo
+/po/hr.gmo
+/po/hu.gmo
+/po/hy.gmo
+/po/id.gmo
+/po/it.gmo
+/po/ja.gmo
+/po/kn.gmo
+/po/ko.gmo
+/po/lt.gmo
+/po/lv.gmo
+/po/mai.gmo
+/po/mk.gmo
+/po/ml.gmo
+/po/mr.gmo
+/po/ms.gmo
+/po/nb.gmo
+/po/ne.gmo
+/po/nl.gmo
+/po/oc.gmo
+/po/or.gmo
+/po/pa.gmo
+/po/pl.gmo
+/po/pt.gmo
+/po/pt_BR.gmo
+/po/ro.gmo
+/po/ru.gmo
+/po/rw.gmo
+/po/si.gmo
+/po/sk.gmo
+/po/sl.gmo
+/po/sq.gmo
+/po/sr.gmo
+/po/sr latin gmo
/po/stamp-it
+/po/sv.gmo
+/po/te.gmo
+/po/th.gmo
+/po/tr.gmo
+/po/uk.gmo
+/po/vi.gmo
+/po/zh_CN.gmo
+/po/zh_HK.gmo
+/po/zh_TW.gmo
/so_locations
/stamp-h1
/tags
diff --git a/Makefile.am b/Makefile.am
index 460a86d..d992748 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = \
pixmaps scripts data \
- doc libfoocanvas libanjuta plugins src manuals mime launcher po
+ doc libanjuta plugins src manuals mime launcher po
anjutadocdir = $(docdir)
anjutadoc_DATA = \
diff --git a/configure.ac b/configure.ac
index 45b8568..0f644cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ VTE_REQUIRED=0.13.1
LIBXML_REQUIRED=2.4.23
GDL_REQUIRED=2.91.1
LIBWNCK_REQUIRED=2.12
-UNIQUE_REQUIRED=1.0.0
+UNIQUE_REQUIRED=2.90.1
dnl GtkSourceView
GTKSOURCEVIEW_REQUIRED=2.9.7
@@ -145,7 +145,7 @@ dnl Check base modules
PKG_CHECK_MODULES([ANJUTA],
[gthread-2.0 >= $GTHREAD_REQUIRED
- unique-1.0 >= $UNIQUE_REQUIRED
+ unique-3.0 >= $UNIQUE_REQUIRED
glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gtk+-3.0 >= $GTK_REQUIRED
@@ -304,7 +304,7 @@ PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
dnl Setup Anjuta Library flags
dnl --------------------------
LIBANJUTA_CFLAGS='$(ANJUTA_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
-LIBANJUTA_LIBS='$(top_builddir)/libanjuta/libanjuta.la'
+LIBANJUTA_LIBS='$(top_builddir)/libanjuta/libanjuta-3.la'
AC_SUBST(LIBANJUTA_CFLAGS)
AC_SUBST(LIBANJUTA_LIBS)
@@ -799,7 +799,7 @@ Makefile
po/Makefile.in
libfoocanvas/Makefile
libanjuta/Makefile
-libanjuta/libanjuta-1.0.pc
+libanjuta/libanjuta-3.0.pc
libanjuta/anjuta-version.h
libanjuta/interfaces/Makefile
src/Makefile
diff --git a/libanjuta/Makefile.am b/libanjuta/Makefile.am
index 3886f0a..522c347 100644
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@ -14,13 +14,13 @@ AM_CPPFLAGS = \
-DPACKAGE_DOC_DIR="\"$(docdir)\"" \
-DG_LOG_DOMAIN=\"libanjuta\"
-lib_LTLIBRARIES = libanjuta.la
-libanjuta_la_LDFLAGS = $(ANJUTA_LDFLAGS)
-libanjuta_la_LIBADD = \
+lib_LTLIBRARIES = libanjuta-3.la
+libanjuta_3_la_LDFLAGS = $(ANJUTA_LDFLAGS)
+libanjuta_3_la_LIBADD = \
interfaces/libanjuta-interfaces.la \
$(ANJUTA_LIBS)
-libanjuta_la_SOURCES= \
+libanjuta_3_la_SOURCES= \
anjuta-enum-types.h \
anjuta-enum-types.c \
anjuta-marshal.h \
@@ -104,11 +104,11 @@ if HAVE_PLUGIN_GLADE
gladeanjutadir = $(libdir)/glade3/modules
-gladeanjuta_LTLIBRARIES = libgladeanjuta.la
-libgladeanjuta_la_SOURCES = anjuta-glade-catalog.c
-libgladeanjuta_la_LDFLAGS = $(ANJUTA_LDFLAGS) -module -avoid-version
-libgladeanjuta_la_LIBADD = \
- libanjuta.la \
+gladeanjuta_LTLIBRARIES = libgladeanjuta-3.la
+libgladeanjuta_3_la_SOURCES = anjuta-glade-catalog.c
+libgladeanjuta_3_la_LDFLAGS = $(ANJUTA_LDFLAGS) -module -avoid-version
+libgladeanjuta_3_la_LIBADD = \
+ libanjuta-3.la \
$(GLADE_LIBS)
# For now install in our own prefix
@@ -119,7 +119,7 @@ catalog_DATA = anjuta-glade.xml
endif
-libanjutaincludedir=$(includedir)/libanjuta-1.0/libanjuta
+libanjutaincludedir=$(includedir)/libanjuta-3.0/libanjuta
libanjuta_include = \
libanjuta.h \
@@ -203,11 +203,11 @@ anjuta-enum-types.c: Makefile
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libanjuta-1.0.pc
+pkgconfig_DATA = libanjuta-3.0.pc
EXTRA_DIST = \
$(libanjutainclude_HEADERS) \
- libanjuta-1.0.pc.in \
+ libanjuta-3.0.pc.in \
anjuta-marshal.list \
$(catalog_DATA)
@@ -225,19 +225,19 @@ if HAVE_INTROSPECTION
anjuta_introspection_sources = $(libanjuta_la_SOURCES)
ianjuta_introspection_sources = $(srcdir)/interfaces/*.c $(srcdir)/interfaces/*.h
-Anjuta-1_0.gir: libanjuta.la
-Anjuta_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0
-Anjuta_1_0_gir_CFLAGS = $(ANJUTA_CFLAGS) -I$(top_srcdir)
-Anjuta_1_0_gir_LIBS = anjuta
-Anjuta_1_0_gir_FILES = $(anjuta_introspection_sources)
-INTROSPECTION_GIRS += Anjuta-1.0.gir
-
-IAnjuta-1_0.gir: interfaces/libanjuta-interfaces.la libanjuta.la Anjuta-1.0.gir
-IAnjuta_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 Anjuta-1.0
-IAnjuta_1_0_gir_CFLAGS = $(LIBANJUTA_CFLAGS) -I$(top_srcdir)
-IAnjuta_1_0_gir_LIBS = interfaces/libanjuta-interfaces.la anjuta
-IAnjuta_1_0_gir_FILES = $(ianjuta_introspection_sources)
-INTROSPECTION_GIRS += IAnjuta-1.0.gir
+Anjuta-3_0.gir: libanjuta-3.la
+Anjuta_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
+Anjuta_3_0_gir_CFLAGS = $(ANJUTA_CFLAGS) -I$(top_srcdir)
+Anjuta_3_0_gir_LIBS = anjuta
+Anjuta_3_0_gir_FILES = $(anjuta_introspection_sources)
+INTROSPECTION_GIRS += Anjuta-3.0.gir
+
+IAnjuta-3_0.gir: interfaces/libanjuta-interfaces.la libanjuta-3.la Anjuta-3.0.gir
+IAnjuta_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 Anjuta-3.0
+IAnjuta_3_0_gir_CFLAGS = $(LIBANJUTA_CFLAGS) -I$(top_srcdir)
+IAnjuta_3_0_gir_LIBS = interfaces/libanjuta-interfaces.la anjuta
+IAnjuta_3_0_gir_FILES = $(ianjuta_introspection_sources)
+INTROSPECTION_GIRS += IAnjuta-3.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/libanjuta/anjuta-plugin-manager.c b/libanjuta/anjuta-plugin-manager.c
index 3226496..ba09767 100644
--- a/libanjuta/anjuta-plugin-manager.c
+++ b/libanjuta/anjuta-plugin-manager.c
@@ -1891,7 +1891,7 @@ on_plugin_list_selection_changed (GtkTreeSelection *tree_selection,
GList *list;
GtkButton *bt = NULL;
- action_area = (GtkContainer *) dialog->action_area;
+ action_area = GTK_CONTAINER (gtk_dialog_get_action_area (dialog));
list = gtk_container_get_children (action_area);
for (; list; list = list->next) {
bt = list->data;
diff --git a/libanjuta/anjuta-tabber.c b/libanjuta/anjuta-tabber.c
index 4c2fedb..e158476 100644
--- a/libanjuta/anjuta-tabber.c
+++ b/libanjuta/anjuta-tabber.c
@@ -158,7 +158,9 @@ anjuta_tabber_get_padding(GtkWidget* widget)
}
static void
-anjuta_tabber_size_request(GtkWidget* widget, GtkRequisition* req)
+anjuta_tabber_get_preferred_width (GtkWidget* widget,
+ gint* minimum,
+ gint* preferred)
{
g_return_if_fail (ANJUTA_IS_TABBER (widget));
@@ -168,16 +170,53 @@ anjuta_tabber_size_request(GtkWidget* widget, GtkRequisition* req)
for (child = tabber->priv->children; child != NULL; child = g_list_next (child))
{
- GtkRequisition child_req;
+ gint child_min;
+ gint child_preferred;
GtkStyle *style;
- gtk_widget_size_request (GTK_WIDGET (child->data), &child_req);
+ gtk_widget_get_preferred_width (GTK_WIDGET (child->data), &child_min, &child_preferred);
style = gtk_widget_get_style (widget);
- req->width += child_req.width + 2 * (style->xthickness + padding);
- req->height = MAX(req->height, child_req.height + 2 * style->ythickness);
+ if (minimum)
+ {
+ *minimum += child_min + 2 * (style->xthickness + padding);
+ }
+ if (preferred)
+ {
+ *preferred += child_preferred + 2 * (style->xthickness + padding);
+ }
+ }
+}
+
+static void
+anjuta_tabber_get_preferred_height (GtkWidget* widget,
+ gint* minimum,
+ gint* preferred)
+{
+ g_return_if_fail (ANJUTA_IS_TABBER (widget));
+
+ AnjutaTabber* tabber = ANJUTA_TABBER (widget);
+ GList* child;
+
+ for (child = tabber->priv->children; child != NULL; child = g_list_next (child))
+ {
+ gint child_min;
+ gint child_preferred;
+ GtkStyle *style;
+
+ gtk_widget_get_preferred_height (GTK_WIDGET (child->data), &child_min, &child_preferred);
+ style = gtk_widget_get_style (widget);
+ if (minimum)
+ {
+ *minimum = MAX(*minimum, child_min + 2 * style->ythickness);
+ }
+ if (preferred)
+ {
+ *preferred = MAX(*preferred, child_preferred + 2 * style->ythickness);
+ }
}
}
+
static void
anjuta_tabber_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
{
@@ -246,12 +285,15 @@ anjuta_tabber_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
}
static gboolean
-anjuta_tabber_expose_event (GtkWidget* widget, GdkEventExpose *event)
+anjuta_tabber_draw (GtkWidget* widget, cairo_t* cr)
{
g_return_val_if_fail (ANJUTA_IS_TABBER (widget), FALSE);
AnjutaTabber* tabber = ANJUTA_TABBER (widget);
GList* child;
gint padding = anjuta_tabber_get_padding (widget);
+ GtkAllocation widget_alloc;
+
+ gtk_widget_get_allocation (widget, &widget_alloc);
for (child = tabber->priv->children; child != NULL; child = g_list_next (child))
{
@@ -263,22 +305,23 @@ anjuta_tabber_expose_event (GtkWidget* widget, GdkEventExpose *event)
style = gtk_widget_get_style (widget);
- alloc.x -= style->xthickness + padding;
- alloc.y -= style->ythickness;
+ alloc.x -= style->xthickness + padding + widget_alloc.x;
+ alloc.y -= style->ythickness + widget_alloc.y;
alloc.width += 2 * (style->xthickness + padding);
alloc.height += style->ythickness;
gtk_paint_extension (style,
- gtk_widget_get_window (widget),
+ cr,
state, GTK_SHADOW_OUT,
- NULL, widget, "tab",
+ widget, "tab",
alloc.x,
alloc.y,
alloc.width,
alloc.height,
- GTK_POS_BOTTOM);
- gtk_container_propagate_expose (GTK_CONTAINER (tabber),
- GTK_WIDGET(child->data), event);
+ GTK_POS_BOTTOM);
+ gtk_container_propagate_draw (GTK_CONTAINER (tabber),
+ GTK_WIDGET(child->data), cr);
+
}
return FALSE;
}
@@ -476,9 +519,10 @@ anjuta_tabber_class_init (AnjutaTabberClass *klass)
object_class->set_property = anjuta_tabber_set_property;
object_class->get_property = anjuta_tabber_get_property;
- widget_class->size_request = anjuta_tabber_size_request;
+ widget_class->get_preferred_height = anjuta_tabber_get_preferred_height;
+ widget_class->get_preferred_width = anjuta_tabber_get_preferred_width;
widget_class->size_allocate = anjuta_tabber_size_allocate;
- widget_class->expose_event = anjuta_tabber_expose_event;
+ widget_class->draw = anjuta_tabber_draw;
widget_class->button_press_event = anjuta_tabber_button_press_event;
widget_class->realize = anjuta_tabber_realize;
widget_class->unrealize = anjuta_tabber_unrealize;
diff --git a/libanjuta/anjuta-utils.c b/libanjuta/anjuta-utils.c
index b2567b4..50be666 100644
--- a/libanjuta/anjuta-utils.c
+++ b/libanjuta/anjuta-utils.c
@@ -55,8 +55,6 @@
#include <glib/gstdio.h>
#include <gtk/gtk.h>
-#include <gconf/gconf-client.h>
-
#include <libanjuta/anjuta-utils.h>
#include <libanjuta/anjuta-debug.h>
@@ -1132,7 +1130,8 @@ anjuta_util_user_shell (void)
gchar **
anjuta_util_user_terminal (void)
{
-#ifndef G_OS_WIN32
+/* FIXME: GSettings */
+#if 0
GConfClient *client;
gchar *terminal = NULL;
gchar **argv = NULL;
diff --git a/libanjuta/cell-renderer-captioned-image.c b/libanjuta/cell-renderer-captioned-image.c
index 2c65f90..e943e08 100644
--- a/libanjuta/cell-renderer-captioned-image.c
+++ b/libanjuta/cell-renderer-captioned-image.c
@@ -100,7 +100,7 @@ anjuta_cell_renderer_captioned_image_new (void)
static void
anjuta_cell_renderer_captioned_image_get_size (GtkCellRenderer *gtk_cell,
GtkWidget *widget,
- GdkRectangle *cell_area,
+ const GdkRectangle *cell_area,
int *x_offset,
int *y_offset,
int *width,
@@ -135,11 +135,10 @@ anjuta_cell_renderer_captioned_image_get_size (GtkCellRenderer *gtk_cell,
static void
anjuta_cell_renderer_captioned_image_render (GtkCellRenderer *gtk_cell,
- GdkWindow *window,
+ cairo_t *cr,
GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GdkRectangle *expose_area,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
guint flags)
{
@@ -164,13 +163,11 @@ anjuta_cell_renderer_captioned_image_render (GtkCellRenderer *gtk_cell,
text_area.height = height;
text_area.width = width;
- gtk_cell_renderer_render (cell->image, window, widget,
- background_area, &pixbuf_area,
- expose_area, flags);
+ gtk_cell_renderer_render (cell->image, cr, widget,
+ background_area, &pixbuf_area, flags);
- gtk_cell_renderer_render (cell->caption, window, widget,
- background_area, &text_area,
- expose_area, flags);
+ gtk_cell_renderer_render (cell->caption, cr, widget,
+ background_area, &text_area, flags);
}
static void
diff --git a/libanjuta/e-splash.c b/libanjuta/e-splash.c
index 42a80ff..209796f 100644
--- a/libanjuta/e-splash.c
+++ b/libanjuta/e-splash.c
@@ -58,7 +58,7 @@ G_DEFINE_TYPE(ESplash, e_splash, GTK_TYPE_WINDOW)
/* GtkObject methods. */
static void
-impl_destroy (GtkObject *object)
+impl_destroy (GtkWidget *object)
{
ESplash *splash;
ESplashPrivate *priv;
@@ -84,10 +84,10 @@ e_splash_finalize (GObject *obj)
static void
e_splash_class_init (ESplashClass *klass)
{
- GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass);;
GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
- gtkobject_class->destroy = impl_destroy;
+ widget_class->destroy = impl_destroy;
object_class->finalize = e_splash_finalize;
}
@@ -113,19 +113,15 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer data)
}
static gboolean
-on_expose_event_cb (GtkWidget *widget, GdkEventExpose *event,
- ESplash *splash)
+on_draw_cb (GtkWidget *widget, cairo_t *cr,
+ ESplash *splash)
{
ESplashPrivate *priv;
- GdkWindow *window;
- cairo_t *cr;
gint inc_width;
priv = splash->priv;
- window = gtk_widget_get_window (widget);
/* draw the background pixbuf */
- cr = gdk_cairo_create (window);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
gdk_cairo_set_source_pixbuf (cr, priv->splash_image_pixbuf, 0, 0);
@@ -134,7 +130,6 @@ on_expose_event_cb (GtkWidget *widget, GdkEventExpose *event,
/* draw the plugin icon */
if (priv->icon_pixbuf)
{
- cr = gdk_cairo_create (window);
gdk_cairo_set_source_pixbuf (cr, priv->icon_pixbuf, ICON_X, ICON_Y);
cairo_paint (cr);
@@ -152,7 +147,6 @@ on_expose_event_cb (GtkWidget *widget, GdkEventExpose *event,
pango_layout_set_markup (layout, priv->title, -1);
pango_layout_get_size (layout, NULL, &layout_height);
- cr = gdk_cairo_create (window);
cairo_move_to (cr, ICON_X + ICON_SIZE + 10,
ICON_Y + ICON_SIZE - PROGRESS_SIZE - PANGO_PIXELS (layout_height));
@@ -165,14 +159,12 @@ on_expose_event_cb (GtkWidget *widget, GdkEventExpose *event,
inc_width = gdk_pixbuf_get_width (priv->splash_image_pixbuf);
inc_width -= (ICON_X + ICON_SIZE + 20);
- cr = gdk_cairo_create (window);
cairo_set_source_rgb (cr, 0.0, 0.0, 1.0);
cairo_rectangle (cr, ICON_X + ICON_SIZE + 10, ICON_Y + ICON_SIZE,
inc_width, PROGRESS_SIZE);
cairo_fill (cr);
- cr = gdk_cairo_create (window);
cairo_rectangle (cr, ICON_X + ICON_SIZE + 10, ICON_Y + ICON_SIZE,
(priv->progress_percentage * inc_width), PROGRESS_SIZE);
@@ -210,8 +202,8 @@ e_splash_construct (ESplash *splash,
gtk_widget_set_size_request (GTK_WIDGET (splash), image_width, image_height);
- g_signal_connect (G_OBJECT (splash), "expose-event",
- G_CALLBACK (on_expose_event_cb), splash);
+ g_signal_connect (G_OBJECT (splash), "draw",
+ G_CALLBACK (on_draw_cb), splash);
g_signal_connect (G_OBJECT (splash), "button-press-event",
G_CALLBACK (button_press_event), splash);
diff --git a/libanjuta/interfaces/Makefile.am.iface b/libanjuta/interfaces/Makefile.am.iface
index 9bb2e43..3595dc8 100644
--- a/libanjuta/interfaces/Makefile.am.iface
+++ b/libanjuta/interfaces/Makefile.am.iface
@@ -7,9 +7,9 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"libanjuta-interfaces\" \
"-DG_LOG_FATAL_MASK=\"(G_LOG_FLAG_RECURSION|G_LOG_LEVEL_ERROR|G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING)\""
-MODULE_NAME = libanjuta
-MODULE_VERSION = 0.1
-MODULE_INCLUDEDIR = $(includedir)/libanjuta-1.0/libanjuta/interfaces
+MODULE_NAME = libanjuta-3
+MODULE_VERSION = 2.91
+MODULE_INCLUDEDIR = $(includedir)/libanjuta-3.0/libanjuta/interfaces
MODULE_LIBS = $(GTK_LIBS)
@@IFACE_RULES@@
diff --git a/libanjuta/libanjuta-1.0.pc.in b/libanjuta/libanjuta-3.0.pc.in
similarity index 62%
rename from libanjuta/libanjuta-1.0.pc.in
rename to libanjuta/libanjuta-3.0.pc.in
index ece3576..c6ee4cd 100644
--- a/libanjuta/libanjuta-1.0.pc.in
+++ b/libanjuta/libanjuta-3.0.pc.in
@@ -3,12 +3,12 @@ exec_prefix= exec_prefix@
libdir= libdir@
datarootdir= datarootdir@
datadir= datadir@
-includedir= includedir@/libanjuta-1.0
-idldir= datadir@/idl/libanjuta-1.0
+includedir= includedir@/libanjuta-3.0
+idldir= datadir@/idl/libanjuta-3.0
Name: libanjuta
Description: Libraries for developing Anjuta plugins.
Version: @VERSION@
-Requires: gconf-2.0 gtk+-2.0
-Libs: -L${libdir} -lanjuta
+Requires: gtk+-3.0
+Libs: -L${libdir} -lanjuta-3
Cflags: -I${includedir}
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index b17d8ef..12cf795 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -3,9 +3,7 @@
SUBDIRS = . \
message-view \
gdb \
- debug-manager \
file-manager \
- terminal \
build-basic-autotools \
file-loader \
file-wizard \
@@ -14,7 +12,6 @@ SUBDIRS = . \
cvs-plugin \
snippets-manager \
class-gen \
- class-inheritance \
patch \
subversion \
project-import \
diff --git a/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui b/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
index 52b32c1..8062aba 100644
--- a/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
+++ b/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
@@ -439,8 +439,9 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxEntry" id="configuration_combo_entry">
+ <object class="GtkComboBoxText" id="configuration_combo_entry">
<property name="visible">True</property>
+ <property name="has-entry">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
</object>
<packing>
diff --git a/plugins/build-basic-autotools/build-options.c b/plugins/build-basic-autotools/build-options.c
index 2e39a79..ab7a0e6 100644
--- a/plugins/build-basic-autotools/build-options.c
+++ b/plugins/build-basic-autotools/build-options.c
@@ -246,7 +246,7 @@ on_select_configuration (GtkComboBox *widget, gpointer user_data)
}
else
{
- name = gtk_combo_box_get_active_text (GTK_COMBO_BOX (dlg->combo));
+ name = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (dlg->combo));
}
if (*name == '\0')
@@ -285,7 +285,7 @@ fill_dialog (BuildConfigureDialog *dlg)
BuildConfiguration *cfg;
gtk_combo_box_set_model (GTK_COMBO_BOX(dlg->combo), GTK_TREE_MODEL(store));
- gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (dlg->combo), 0);
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (dlg->combo), 0);
for (cfg = build_configuration_list_get_first (dlg->config_list); cfg != NULL; cfg = build_configuration_next (cfg))
{
@@ -350,7 +350,7 @@ build_dialog_configure (GtkWindow* parent, const gchar *project_root_uri, BuildC
}
else
{
- name = gtk_combo_box_get_active_text (GTK_COMBO_BOX (dlg.combo));
+ name = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (dlg.combo));
}
cfg = build_configuration_list_create (config_list, name);
g_free (name);
diff --git a/plugins/class-gen/combo-flags.c b/plugins/class-gen/combo-flags.c
index 2c4f80b..8b5e5e8 100644
--- a/plugins/class-gen/combo-flags.c
+++ b/plugins/class-gen/combo-flags.c
@@ -489,8 +489,8 @@ cg_combo_flags_treeview_key_press_cb (G_GNUC_UNUSED GtkWidget *widget,
switch (event->keyval)
{
- case GDK_space:
- case GDK_KP_Space:
+ case GDK_KEY_space:
+ case GDK_KEY_KP_Space:
selection =
gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
@@ -504,8 +504,8 @@ cg_combo_flags_treeview_key_press_cb (G_GNUC_UNUSED GtkWidget *widget,
return FALSE;
break;
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
selection =
gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
@@ -557,7 +557,7 @@ cg_combo_flags_window_key_press_cb (G_GNUC_UNUSED GtkWidget *widget,
switch (event->keyval)
{
- case GDK_Escape:
+ case GDK_KEY_Escape:
priv->editing_canceled = TRUE;
cg_combo_flags_popdown (combo);
return TRUE;
diff --git a/plugins/class-gen/window.c b/plugins/class-gen/window.c
index 6390681..7698898 100644
--- a/plugins/class-gen/window.c
+++ b/plugins/class-gen/window.c
@@ -178,7 +178,7 @@ cg_window_fetch_string (CgWindow *window,
if (GTK_IS_ENTRY (widget))
return g_strdup (gtk_entry_get_text(GTK_ENTRY(widget)));
else if (GTK_IS_COMBO_BOX (widget))
- return gtk_combo_box_get_active_text (GTK_COMBO_BOX(widget));
+ return gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(widget));
else
return NULL;
}
diff --git a/plugins/debug-manager/chunk_view.c b/plugins/debug-manager/chunk_view.c
index d03b657..8c310d0 100644
--- a/plugins/debug-manager/chunk_view.c
+++ b/plugins/debug-manager/chunk_view.c
@@ -181,14 +181,12 @@ static void
dma_chunk_view_class_init (DmaChunkViewClass * klass)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkTextViewClass *text_view_class;
g_return_if_fail (klass != NULL);
gobject_class = G_OBJECT_CLASS (klass);
- object_class = GTK_OBJECT_CLASS (klass);
widget_class = GTK_WIDGET_CLASS (klass);
text_view_class = GTK_TEXT_VIEW_CLASS (klass);
parent_class = GTK_WIDGET_CLASS (g_type_class_peek_parent (klass));
diff --git a/plugins/debug-manager/data_view.c b/plugins/debug-manager/data_view.c
index 6a81b10..bbc627f 100644
--- a/plugins/debug-manager/data_view.c
+++ b/plugins/debug-manager/data_view.c
@@ -136,19 +136,19 @@ dma_data_view_goto_key_press_event (GtkWidget *widget,
g_return_val_if_fail (IS_DMA_DATA_VIEW (view), FALSE);
/* Close window */
- if (event->keyval == GDK_Escape ||
- event->keyval == GDK_Tab ||
- event->keyval == GDK_KP_Tab ||
- event->keyval == GDK_ISO_Left_Tab)
+ if (event->keyval == GDK_KEY_Escape ||
+ event->keyval == GDK_KEY_Tab ||
+ event->keyval == GDK_KEY_KP_Tab ||
+ event->keyval == GDK_KEY_ISO_Left_Tab)
{
dma_data_view_goto_window_hide (view);
return TRUE;
}
/* Goto to address and close window */
- if (event->keyval == GDK_Return ||
- event->keyval == GDK_ISO_Enter ||
- event->keyval == GDK_KP_Enter)
+ if (event->keyval == GDK_KEY_Return ||
+ event->keyval == GDK_KEY_ISO_Enter ||
+ event->keyval == GDK_KEY_KP_Enter)
{
gulong adr;
const gchar *text;
@@ -176,7 +176,7 @@ dma_data_view_goto_position_func (DmaDataView *view)
gint x, y;
gint win_x, win_y;
GdkWindow *window = gtk_widget_get_window (GTK_WIDGET (view));
- GdkScreen *screen = gdk_drawable_get_screen (window);
+ GdkScreen *screen = gdk_window_get_screen (window);
gint monitor_num;
GdkRectangle monitor;
@@ -557,34 +557,30 @@ dma_data_view_size_allocate (GtkWidget *widget,
static void
dma_data_view_paint (GtkWidget *widget,
- GdkRectangle *area)
+ cairo_t *cr)
{
DmaDataView *view = DMA_DATA_VIEW (widget);
if (view->shadow_type != GTK_SHADOW_NONE)
{
gtk_paint_shadow (gtk_widget_get_style (widget),
- gtk_widget_get_window (widget),
- GTK_STATE_NORMAL, view->shadow_type,
- area, widget, "dma_data_view",
- view->frame.x,
- view->frame.y,
- view->frame.width,
- view->frame.height);
+ cr,
+ GTK_STATE_NORMAL, view->shadow_type,
+ widget, "dma_data_view",
+ view->frame.x,
+ view->frame.y,
+ view->frame.width,
+ view->frame.height);
}
}
static gint
-dma_data_view_expose (GtkWidget *widget,
- GdkEventExpose *event)
+dma_data_view_draw (GtkWidget *widget,
+ cairo_t *cr)
{
- if (gtk_widget_is_drawable (widget))
- {
- dma_data_view_paint (widget, &event->area);
-
- (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
- }
+ dma_data_view_paint (widget, cr);
+ (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, cr);
return FALSE;
}
@@ -802,7 +798,7 @@ dma_data_view_forall (GtkContainer *container,
*---------------------------------------------------------------------------*/
static void
-dma_data_view_destroy (GtkObject *object)
+dma_data_view_destroy (GtkWidget *object)
{
DmaDataView *view;
@@ -826,7 +822,7 @@ dma_data_view_destroy (GtkObject *object)
view->goto_entry = NULL;
}
- GTK_OBJECT_CLASS (parent_class)->destroy (object);
+ GTK_WIDGET_CLASS (parent_class)->destroy (object);
}
@@ -887,14 +883,12 @@ static void
dma_data_view_class_init (DmaDataViewClass * klass)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
g_return_if_fail (klass != NULL);
gobject_class = G_OBJECT_CLASS (klass);
- object_class = GTK_OBJECT_CLASS (klass);
widget_class = GTK_WIDGET_CLASS (klass);
container_class = GTK_CONTAINER_CLASS (klass);
parent_class = GTK_WIDGET_CLASS (g_type_class_peek_parent (klass));
@@ -902,11 +896,11 @@ dma_data_view_class_init (DmaDataViewClass * klass)
gobject_class->dispose = dma_data_view_dispose;
gobject_class->finalize = dma_data_view_finalize;
- object_class->destroy = dma_data_view_destroy;
+ widget_class->destroy = dma_data_view_destroy;
widget_class->size_request = dma_data_view_size_request;
widget_class->size_allocate = dma_data_view_size_allocate;
- widget_class->expose_event = dma_data_view_expose;
+ widget_class->draw = dma_data_view_draw;
container_class->forall = dma_data_view_forall;
container_class->child_type = dma_data_view_child_type;
diff --git a/plugins/debug-manager/sharedlib.c b/plugins/debug-manager/sharedlib.c
index 1b82d0e..a26c3f2 100644
--- a/plugins/debug-manager/sharedlib.c
+++ b/plugins/debug-manager/sharedlib.c
@@ -53,7 +53,7 @@ static gboolean
on_sharedlibs_key_press_event (GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event->keyval == GDK_Escape)
+ if (event->keyval == GDK_KEY_Escape)
{
Sharedlibs* sl = data;
sharedlibs_hide(sl);
@@ -312,8 +312,8 @@ sharedlibs_hide (Sharedlibs* sl)
window = gtk_widget_get_window (sl->widgets.window);
gdk_window_get_root_origin (window,
&sl->win_pos_x, &sl->win_pos_y);
- gdk_drawable_get_size (window,
- &sl->win_width, &sl->win_height);
+ gdk_window_get_geometry (window, NULL, NULL,
+ &sl->win_width, &sl->win_height, NULL);
gtk_widget_hide(sl->widgets.window);
sl->is_showing = FALSE;
}
diff --git a/plugins/debug-manager/signals.c b/plugins/debug-manager/signals.c
index 7e15099..a1b651c 100644
--- a/plugins/debug-manager/signals.c
+++ b/plugins/debug-manager/signals.c
@@ -137,7 +137,7 @@ static gboolean
on_signals_key_press_event(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event->keyval == GDK_Escape)
+ if (event->keyval == GDK_KEY_Escape)
{
Signals* cr = (Signals*) data;
signals_hide(cr);
@@ -449,8 +449,8 @@ signals_hide (Signals * sg)
window = gtk_widget_get_window (sg->widgets.window);
gdk_window_get_root_origin (window, &sg->win_pos_x,
&sg->win_pos_y);
- gdk_drawable_get_size (window, &sg->win_width,
- &sg->win_height);
+ gdk_window_get_geometry (window, NULL, NULL, &sg->win_width,
+ &sg->win_height, NULL);
gtk_widget_hide (sg->widgets.window);
sg->is_showing = FALSE;
}
diff --git a/plugins/debug-manager/sparse_view.c b/plugins/debug-manager/sparse_view.c
index a71b92e..220ebd5 100644
--- a/plugins/debug-manager/sparse_view.c
+++ b/plugins/debug-manager/sparse_view.c
@@ -159,19 +159,19 @@ dma_sparse_view_goto_key_press_event (GtkWidget *widget,
g_return_val_if_fail (DMA_IS_SPARSE_VIEW (view), FALSE);
/* Close window */
- if (event->keyval == GDK_Escape ||
- event->keyval == GDK_Tab ||
- event->keyval == GDK_KP_Tab ||
- event->keyval == GDK_ISO_Left_Tab)
+ if (event->keyval == GDK_KEY_Escape ||
+ event->keyval == GDK_KEY_Tab ||
+ event->keyval == GDK_KEY_KP_Tab ||
+ event->keyval == GDK_KEY_ISO_Left_Tab)
{
dma_sparse_view_goto_window_hide (view);
return TRUE;
}
/* Goto to address and close window */
- if (event->keyval == GDK_Return ||
- event->keyval == GDK_ISO_Enter ||
- event->keyval == GDK_KP_Enter)
+ if (event->keyval == GDK_KEY_Return ||
+ event->keyval == GDK_KEY_ISO_Enter ||
+ event->keyval == GDK_KEY_KP_Enter)
{
gulong adr;
const gchar *text;
@@ -199,7 +199,7 @@ dma_sparse_view_goto_position_func (DmaSparseView *view)
gint x, y;
gint win_x, win_y;
GdkWindow *window = gtk_widget_get_window (GTK_WIDGET (view));
- GdkScreen *screen = gdk_drawable_get_screen (window);
+ GdkScreen *screen = gdk_window_get_screen (window);
gint monitor_num;
GdkRectangle monitor;
@@ -643,7 +643,7 @@ draw_line_markers (DmaSparseView *view,
static void
dma_sparse_view_paint_margin (DmaSparseView *view,
- GdkEventExpose *event)
+ cairo_t *cr)
{
GtkTextView *text_view;
GdkWindow *win;
@@ -673,6 +673,8 @@ dma_sparse_view_paint_margin (DmaSparseView *view,
win = gtk_text_view_get_window (text_view,
GTK_TEXT_WINDOW_LEFT);
+
+
y1 = event->area.y;
y2 = y1 + event->area.height;
@@ -756,10 +758,9 @@ dma_sparse_view_paint_margin (DmaSparseView *view,
pango_layout_set_markup (layout, str, -1);
gtk_paint_layout (gtk_widget_get_style (GTK_WIDGET (view)),
- win,
+ cr,
gtk_widget_get_state (GTK_WIDGET (view)),
FALSE,
- NULL,
GTK_WIDGET (view),
NULL,
text_width + 2,
@@ -834,9 +835,8 @@ dma_sparse_view_value_changed (GtkAdjustment *adj,
}
static void
-dma_sparse_view_set_scroll_adjustments (GtkTextView *text_view,
- GtkAdjustment *hadj,
- GtkAdjustment *vadj)
+dma_sparse_view_set_vadjustments (GtkTextView *text_view,
+ GtkAdjustment *vadj)
{
DmaSparseView *view = DMA_SPARSE_VIEW (text_view);
@@ -854,7 +854,7 @@ dma_sparse_view_set_scroll_adjustments (GtkTextView *text_view,
if (view->priv->vadjustment != vadj)
{
- GTK_TEXT_VIEW_CLASS (parent_class)->set_scroll_adjustments (GTK_TEXT_VIEW (view), hadj, NULL);
+ GTK_SCROLLABLE_CLASS (parent_class)->set_vadjustments (GTK_TEXT_VIEW (view), vadj);
if (vadj != NULL)
{
@@ -873,6 +873,7 @@ dma_sparse_view_set_scroll_adjustments (GtkTextView *text_view,
}
}
+
/* Public functions
*---------------------------------------------------------------------------*/
@@ -979,8 +980,8 @@ dma_sparse_view_get_location (DmaSparseView *view)
*---------------------------------------------------------------------------*/
static gint
-dma_sparse_view_expose (GtkWidget *widget,
- GdkEventExpose *event)
+dma_sparse_view_draw (GtkWidget *widget,
+ cairo_t *cr)
{
DmaSparseView *view;
GtkTextView *text_view;
@@ -992,15 +993,15 @@ dma_sparse_view_expose (GtkWidget *widget,
event_handled = FALSE;
/* now check for the left window, which contains the margin */
- if (event->window == gtk_text_view_get_window (text_view,
- GTK_TEXT_WINDOW_LEFT))
+ if (gdk_cairo_should_draw_window (cr, gtk_text_view_get_window (text_view,
+ GTK_TEXT_WINDOW_LEFT)))
{
dma_sparse_view_paint_margin (view, event);
event_handled = TRUE;
- }
+ }
else
{
- event_handled = GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+ event_handled = GTK_WIDGET_CLASS (parent_class)->draw (widget, cr);
}
return event_handled;
@@ -1024,7 +1025,7 @@ dma_sparse_view_size_allocate (GtkWidget *widget,
*---------------------------------------------------------------------------*/
static void
-dma_sparse_view_destroy (GtkObject *object)
+dma_sparse_view_destroy (GtkWidget *object)
{
DmaSparseView *view;
@@ -1175,16 +1176,16 @@ static void
dma_sparse_view_class_init (DmaSparseViewClass * klass)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkTextViewClass *text_view_class;
+ GtkScrollableClass *scrollable_class;
g_return_if_fail (klass != NULL);
gobject_class = (GObjectClass *) klass;
- object_class = (GtkObjectClass *) klass;
widget_class = GTK_WIDGET_CLASS (klass);
text_view_class = GTK_TEXT_VIEW_CLASS (klass);
+ scrollable_class = GTK_SCROLLABLE_CLASS (klass);
parent_class = (GtkTextViewClass*) g_type_class_peek_parent (klass);
gobject_class->dispose = dma_sparse_view_dispose;
@@ -1192,13 +1193,13 @@ dma_sparse_view_class_init (DmaSparseViewClass * klass)
gobject_class->get_property = dma_sparse_view_get_property;
gobject_class->set_property = dma_sparse_view_set_property;
- object_class->destroy = dma_sparse_view_destroy;
+ widget_class->destroy = dma_sparse_view_destroy;
widget_class->size_allocate = dma_sparse_view_size_allocate;
- widget_class->expose_event = dma_sparse_view_expose;
+ widget_class->draw = dma_sparse_view_draw;
text_view_class->move_cursor = dma_sparse_view_move_cursor;
- text_view_class->set_scroll_adjustments = dma_sparse_view_set_scroll_adjustments;
+ scrollable_class->set_vadjustment = dma_sparse_view_set_vadjustment;
g_object_class_install_property (gobject_class,
PROP_SHOW_LINE_NUMBERS,
diff --git a/plugins/debug-manager/start.c b/plugins/debug-manager/start.c
index 785465a..ee81a88 100644
--- a/plugins/debug-manager/start.c
+++ b/plugins/debug-manager/start.c
@@ -798,11 +798,11 @@ attach_process_show (AttachProcess * ap, GtkWindow *parent)
G_CALLBACK (on_selection_changed), ap);
g_signal_connect (G_OBJECT (ap->dialog), "delete_event",
G_CALLBACK (on_delete_event), ap);
- g_signal_connect (GTK_OBJECT (checkb_hide_paths), "toggled",
+ g_signal_connect (checkb_hide_paths, "toggled",
G_CALLBACK (on_toggle_hide_paths), ap);
- g_signal_connect (GTK_OBJECT (checkb_hide_params), "toggled",
+ g_signal_connect (checkb_hide_params, "toggled",
G_CALLBACK (on_toggle_hide_params), ap);
- g_signal_connect (GTK_OBJECT (checkb_process_tree), "toggled",
+ g_signal_connect (checkb_process_tree, "toggled",
G_CALLBACK (on_toggle_process_tree), ap);
}
diff --git a/plugins/document-manager/plugin.c b/plugins/document-manager/plugin.c
index 2242c70..e8d6f9f 100644
--- a/plugins/document-manager/plugin.c
+++ b/plugins/document-manager/plugin.c
@@ -134,16 +134,16 @@ static ShortcutMapping global_keymap[] = {
{ m_C_, GDK_Tab, ID_NEXTBUFFER },
{ mSC_, GDK_ISO_Left_Tab, ID_PREVBUFFER },
*/
- { m__M, GDK_1, ID_FIRSTBUFFER },
- { m__M, GDK_2, ID_FIRSTBUFFER + 1},
- { m__M, GDK_3, ID_FIRSTBUFFER + 2},
- { m__M, GDK_4, ID_FIRSTBUFFER + 3},
- { m__M, GDK_5, ID_FIRSTBUFFER + 4},
- { m__M, GDK_6, ID_FIRSTBUFFER + 5},
- { m__M, GDK_7, ID_FIRSTBUFFER + 6},
- { m__M, GDK_8, ID_FIRSTBUFFER + 7},
- { m__M, GDK_9, ID_FIRSTBUFFER + 8},
- { m__M, GDK_0, ID_FIRSTBUFFER + 9},
+ { m__M, GDK_KEY_1, ID_FIRSTBUFFER },
+ { m__M, GDK_KEY_2, ID_FIRSTBUFFER + 1},
+ { m__M, GDK_KEY_3, ID_FIRSTBUFFER + 2},
+ { m__M, GDK_KEY_4, ID_FIRSTBUFFER + 3},
+ { m__M, GDK_KEY_5, ID_FIRSTBUFFER + 4},
+ { m__M, GDK_KEY_6, ID_FIRSTBUFFER + 5},
+ { m__M, GDK_KEY_7, ID_FIRSTBUFFER + 6},
+ { m__M, GDK_KEY_8, ID_FIRSTBUFFER + 7},
+ { m__M, GDK_KEY_9, ID_FIRSTBUFFER + 8},
+ { m__M, GDK_KEY_0, ID_FIRSTBUFFER + 9},
{ 0, 0, 0 }
};
@@ -1376,8 +1376,8 @@ on_window_key_release_event (AnjutaShell *shell,
{
g_return_val_if_fail (event != NULL, FALSE);
- if (plugin->g_tabbing && ((event->keyval == GDK_Control_L) ||
- (event->keyval == GDK_Control_R)))
+ if (plugin->g_tabbing && ((event->keyval == GDK_KEY_Control_L) ||
+ (event->keyval == GDK_KEY_Control_R)))
{
GtkNotebook *notebook = GTK_NOTEBOOK (plugin->docman);
GtkWidget *widget;
diff --git a/plugins/document-manager/search-box.c b/plugins/document-manager/search-box.c
index 266bb65..4a52472 100644
--- a/plugins/document-manager/search-box.c
+++ b/plugins/document-manager/search-box.c
@@ -139,35 +139,35 @@ on_goto_key_pressed (GtkWidget* entry, GdkEventKey* event, SearchBox* search_box
SearchBoxPrivate* private = GET_PRIVATE(search_box);
switch (event->keyval)
{
- case GDK_0:
- case GDK_1:
- case GDK_2:
- case GDK_3:
- case GDK_4:
- case GDK_5:
- case GDK_6:
- case GDK_7:
- case GDK_8:
- case GDK_9:
- case GDK_KP_0:
- case GDK_KP_1:
- case GDK_KP_2:
- case GDK_KP_3:
- case GDK_KP_4:
- case GDK_KP_5:
- case GDK_KP_6:
- case GDK_KP_7:
- case GDK_KP_8:
- case GDK_KP_9:
- case GDK_Return:
- case GDK_KP_Enter:
- case GDK_BackSpace:
- case GDK_Delete:
+ case GDK_KEY_0:
+ case GDK_KEY_1:
+ case GDK_KEY_2:
+ case GDK_KEY_3:
+ case GDK_KEY_4:
+ case GDK_KEY_5:
+ case GDK_KEY_6:
+ case GDK_KEY_7:
+ case GDK_KEY_8:
+ case GDK_KEY_9:
+ case GDK_KEY_KP_0:
+ case GDK_KEY_KP_1:
+ case GDK_KEY_KP_2:
+ case GDK_KEY_KP_3:
+ case GDK_KEY_KP_4:
+ case GDK_KEY_KP_5:
+ case GDK_KEY_KP_6:
+ case GDK_KEY_KP_7:
+ case GDK_KEY_KP_8:
+ case GDK_KEY_KP_9:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
+ case GDK_KEY_BackSpace:
+ case GDK_KEY_Delete:
{
/* This is a number or enter which is ok */
break;
}
- case GDK_Escape:
+ case GDK_KEY_Escape:
{
gtk_widget_hide (GTK_WIDGET (search_box));
search_box_set_entry_color (search_box, TRUE);
@@ -193,7 +193,7 @@ on_entry_key_pressed (GtkWidget* entry, GdkEventKey* event, SearchBox* search_bo
SearchBoxPrivate* private = GET_PRIVATE(search_box);
switch (event->keyval)
{
- case GDK_Escape:
+ case GDK_KEY_Escape:
{
gtk_widget_hide (GTK_WIDGET (search_box));
search_box_set_entry_color (search_box, TRUE);
diff --git a/plugins/file-loader/plugin.c b/plugins/file-loader/plugin.c
index 6580073..4dcdf2d 100644
--- a/plugins/file-loader/plugin.c
+++ b/plugins/file-loader/plugin.c
@@ -278,12 +278,12 @@ open_with_dialog (AnjutaFileLoaderPlugin *plugin, const gchar *uri,
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
hbox, FALSE, FALSE, 5);
label = gtk_label_new (_("Open with:"));
- options = gtk_combo_box_new_text ();
+ options = gtk_combo_box_text_new ();
gtk_box_pack_end (GTK_BOX(hbox), options, FALSE, FALSE, 10);
gtk_box_pack_end (GTK_BOX(hbox), label, FALSE, FALSE, 10);
/* Document manager plugin */
- gtk_combo_box_append_text (GTK_COMBO_BOX (options), _("Document Manager"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (options), _("Document Manager"));
col ++;
/* Open with plugins menu items */
@@ -311,7 +311,7 @@ open_with_dialog (AnjutaFileLoaderPlugin *plugin, const gchar *uri,
anjuta_plugin_description_get_string (desc, "Anjuta Plugin",
"Location", &name);
}
- gtk_combo_box_append_text (GTK_COMBO_BOX (options), name);
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (options), name);
col ++;
g_free (name);
snode = g_list_next (snode);
@@ -323,7 +323,7 @@ open_with_dialog (AnjutaFileLoaderPlugin *plugin, const gchar *uri,
{
/* Separator */
col++;
- gtk_combo_box_append_text (GTK_COMBO_BOX (options), "");
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (options), "");
gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (options), RowSeparatorFunc, GINT_TO_POINTER(col), NULL);
}
node = mime_apps;
@@ -332,7 +332,7 @@ open_with_dialog (AnjutaFileLoaderPlugin *plugin, const gchar *uri,
mime_app = (GAppInfo *)(node->data);
if (g_app_info_should_show (mime_app))
{
- gtk_combo_box_append_text (GTK_COMBO_BOX (options), g_app_info_get_name (mime_app));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (options), g_app_info_get_name (mime_app));
}
node = g_list_next (node);
}
@@ -608,10 +608,10 @@ create_file_open_dialog_gui(GtkWindow* parent, AnjutaFileLoaderPlugin* plugin)
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(on_open_response_ok), plugin);
- g_signal_connect_swapped (GTK_OBJECT (dialog),
+ g_signal_connect_swapped (dialog,
"response",
G_CALLBACK (gtk_widget_destroy),
- GTK_OBJECT (dialog));
+ dialog);
return dialog;
}
diff --git a/plugins/file-manager/file-view.c b/plugins/file-manager/file-view.c
index e2a0052..cff943c 100644
--- a/plugins/file-manager/file-view.c
+++ b/plugins/file-manager/file-view.c
@@ -224,7 +224,7 @@ file_view_row_activated (GtkTreeView* widget, GtkTreePath* sort_path,
static gboolean
file_view_key_press_event (GtkWidget* widget, GdkEventKey* event)
{
- if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)
+ if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)
{
AnjutaFileView* view = ANJUTA_FILE_VIEW (widget);
AnjutaFileViewPrivate* priv = ANJUTA_FILE_VIEW_GET_PRIVATE (view);
diff --git a/plugins/gbf-am/gbf-am-properties.h b/plugins/gbf-am/gbf-am-properties.h
index b3f60bf..085dddd 100644
--- a/plugins/gbf-am/gbf-am-properties.h
+++ b/plugins/gbf-am/gbf-am-properties.h
@@ -24,7 +24,7 @@
#ifndef _GBF_AM_PROPERTIES_H_
#define _GBF_AM_PROPERTIES_H_
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include "gbf-am-project.h"
GtkWidget *gbf_am_properties_get_widget (GbfAmProject *project, GError **error);
diff --git a/plugins/gdb/preferences.c b/plugins/gdb/preferences.c
index 2818100..8ba89c3 100644
--- a/plugins/gdb/preferences.c
+++ b/plugins/gdb/preferences.c
@@ -191,10 +191,10 @@ on_add_printer_in_list (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *ite
/* Gtk builder callbacks */
void gdb_on_printer_add (GtkButton *button, gpointer user_data);
void gdb_on_printer_remove (GtkButton *button, gpointer user_data);
-void gdb_on_destroy_preferences (GtkObject *object, gpointer user_data);
+void gdb_on_destroy_preferences (GtkWidget *object, gpointer user_data);
void
-gdb_on_destroy_preferences (GtkObject *object, gpointer user_data)
+gdb_on_destroy_preferences (GtkWidget *object, gpointer user_data)
{
PreferenceDialog *dlg = (PreferenceDialog *)user_data;
GList *new_list;
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index a1dd510..506cb46 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -65,7 +65,6 @@
<property name="title" translatable="yes">Commit Changes</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox16">
<property name="visible">True</property>
@@ -337,7 +336,6 @@
<object class="GtkProgressBar" id="commit_status_progress_bar">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="activity_mode">True</property>
<property name="text" translatable="yes">Retrieving statusâ?¦</property>
</object>
<packing>
diff --git a/plugins/git/git-log-dialog.c b/plugins/git/git-log-dialog.c
index 8b9f2b9..73d29aa 100644
--- a/plugins/git/git-log-dialog.c
+++ b/plugins/git/git-log-dialog.c
@@ -417,7 +417,7 @@ on_log_browse_button_clicked (GtkButton *button, LogData *data)
}
static void
-on_log_vbox_destroy (GtkObject *log_vbox, LogData *data)
+on_log_vbox_destroy (GtkWidget *log_vbox, LogData *data)
{
g_free (data->path);
g_object_unref (data->bxml);
diff --git a/plugins/git/git-ui-utils.c b/plugins/git/git-ui-utils.c
index 2fef97a..b12a69d 100644
--- a/plugins/git/git-ui-utils.c
+++ b/plugins/git/git-ui-utils.c
@@ -301,7 +301,6 @@ message_dialog (GtkMessageType message_type, const gchar *message)
break;
}
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_widget_set_size_request (text_view, 500, 150);
gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
diff --git a/plugins/message-view/anjuta-msgman.c b/plugins/message-view/anjuta-msgman.c
index 558dc6e..c7ff675 100644
--- a/plugins/message-view/anjuta-msgman.c
+++ b/plugins/message-view/anjuta-msgman.c
@@ -152,7 +152,7 @@ anjuta_msgman_page_new (GtkWidget * view, const gchar * name,
gtk_widget_set_name (page->close_button, "anjuta-tab-close-button");
g_object_set_data (G_OBJECT (page->close_button), "message_view", page->widget);
- g_signal_connect (GTK_OBJECT (page->close_button), "clicked",
+ g_signal_connect (page->close_button, "clicked",
G_CALLBACK(on_msgman_close_page),
msgman);
@@ -189,14 +189,6 @@ anjuta_msgman_page_from_widget (AnjutaMsgman * msgman, MessageView * mv)
return NULL;
}
-static void
-on_notebook_switch_page (GtkNotebook * notebook,
- GtkWidget * npage,
- gint page_num, AnjutaMsgman * msgman)
-{
- g_signal_emit_by_name(G_OBJECT(msgman), "view_changed");
-}
-
static gpointer parent_class;
static void
@@ -221,8 +213,6 @@ anjuta_msgman_finalize (GObject *obj)
static void
anjuta_msgman_instance_init (AnjutaMsgman * msgman)
{
- g_signal_connect_after (GTK_NOTEBOOK (msgman), "switch-page",
- G_CALLBACK (on_notebook_switch_page), msgman);
gtk_notebook_set_scrollable (GTK_NOTEBOOK (msgman), TRUE);
msgman->priv = g_new0(AnjutaMsgmanPriv, 1);
msgman->priv->views = NULL;
@@ -230,34 +220,17 @@ anjuta_msgman_instance_init (AnjutaMsgman * msgman)
msgman->priv->tabber = anjuta_tabber_new (GTK_NOTEBOOK (msgman));
msgman->priv->button_group = NULL;
- g_signal_connect(GTK_OBJECT(msgman), "popup-menu",
+ g_signal_connect(msgman, "popup-menu",
G_CALLBACK(on_msgman_popup_menu), msgman);
- g_signal_connect(GTK_OBJECT(msgman), "button-press-event",
+ g_signal_connect(msgman, "button-press-event",
G_CALLBACK(on_tab_button_press_event), msgman);
}
static void
anjuta_msgman_class_init (AnjutaMsgmanClass * klass)
{
- static gboolean initialized = FALSE;
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- if (!initialized) {
- /* Signal */
- g_signal_new ("view-changed",
- ANJUTA_TYPE_MSGMAN,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (AnjutaMsgman, view_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0,
- NULL);
-
-
- initialized = TRUE;
- }
-
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = anjuta_msgman_finalize;
gobject_class->dispose = anjuta_msgman_dispose;
diff --git a/plugins/message-view/message-view.c b/plugins/message-view/message-view.c
index be596db..0c0a8ce 100644
--- a/plugins/message-view/message-view.c
+++ b/plugins/message-view/message-view.c
@@ -285,8 +285,8 @@ on_message_event (GObject* object, GdkEvent* event, gpointer data)
{
switch(((GdkEventKey *)event)->keyval)
{
- case GDK_space:
- case GDK_Return:
+ case GDK_KEY_space:
+ case GDK_KEY_Return:
{
const gchar* message =
ianjuta_message_view_get_current_message(IANJUTA_MESSAGE_VIEW (view), NULL);
diff --git a/plugins/message-view/plugin.c b/plugins/message-view/plugin.c
index 0b14954..55661c2 100644
--- a/plugins/message-view/plugin.c
+++ b/plugins/message-view/plugin.c
@@ -93,7 +93,8 @@ static GtkActionEntry actions_goto[] = {
G_CALLBACK (on_save_message)}
};
-static void on_view_changed(AnjutaMsgman* msgman, MessageViewPlugin* plugin)
+static void on_view_changed(AnjutaMsgman* msgman, GtkWidget* page,
+ gint page_num, MessageViewPlugin* plugin)
{
MessageView* view = anjuta_msgman_get_current_view (msgman);
AnjutaUI* ui = anjuta_shell_get_ui (ANJUTA_PLUGIN(plugin)->shell, NULL);
@@ -173,7 +174,7 @@ activate_plugin (AnjutaPlugin *plugin)
popup = gtk_ui_manager_get_widget (GTK_UI_MANAGER (ui), "/PopupMessageView");
mv_plugin->msgman =
anjuta_msgman_new(popup);
- g_signal_connect(G_OBJECT(mv_plugin->msgman), "view_changed",
+ g_signal_connect(mv_plugin->msgman, "switch-page",
G_CALLBACK(on_view_changed), mv_plugin);
GtkAction* action_next = anjuta_ui_get_action (ui, "ActionGroupGotoMessages",
"ActionMessageNext");
diff --git a/plugins/project-manager/gbf-project-view.c b/plugins/project-manager/gbf-project-view.c
index a7f1c10..f8be63a 100644
--- a/plugins/project-manager/gbf-project-view.c
+++ b/plugins/project-manager/gbf-project-view.c
@@ -49,7 +49,7 @@ static guint signals [LAST_SIGNAL] = { 0 };
static void gbf_project_view_class_init (GbfProjectViewClass *klass);
static void gbf_project_view_init (GbfProjectView *tree);
-static void destroy (GtkObject *object);
+static void destroy (GtkWidget *object);
static void set_pixbuf (GtkTreeViewColumn *tree_column,
GtkCellRenderer *cell,
@@ -105,7 +105,7 @@ row_activated (GtkTreeView *tree_view,
}
static void
-destroy (GtkObject *object)
+destroy (GtkWidget *object)
{
GbfProjectView *tree;
GbfProjectViewPrivate *priv;
@@ -118,8 +118,8 @@ destroy (GtkObject *object)
tree->priv = NULL;
}
- if (GTK_OBJECT_CLASS (gbf_project_view_parent_class)->destroy)
- (* GTK_OBJECT_CLASS (gbf_project_view_parent_class)->destroy) (object);
+ if (GTK_WIDGET_CLASS (gbf_project_view_parent_class)->destroy)
+ (* GTK_WIDGET_CLASS (gbf_project_view_parent_class)->destroy) (object);
}
static GdkPixbuf*
@@ -238,19 +238,19 @@ search_equal_func (GtkTreeModel *model, gint column,
return ret;
}
-static gint
-expose_event (GtkWidget *widget, GdkEventExpose *ev)
+static gboolean
+draw (GtkWidget *widget, cairo_t *cr)
{
GtkTreeModel *model;
GtkTreeView *tree_view;
gint event_handled = FALSE;
- if (GTK_WIDGET_CLASS (gbf_project_view_parent_class)->expose_event != NULL)
- GTK_WIDGET_CLASS (gbf_project_view_parent_class)->expose_event (widget, ev);
+ if (GTK_WIDGET_CLASS (gbf_project_view_parent_class)->draw != NULL)
+ GTK_WIDGET_CLASS (gbf_project_view_parent_class)->draw (widget, cr);
tree_view = GTK_TREE_VIEW (widget);
model = gtk_tree_view_get_model (tree_view);
- if (ev->window == gtk_tree_view_get_bin_window (tree_view) &&
+ if (gtk_cairo_should_draw_window (cr, gtk_tree_view_get_bin_window (tree_view)) &&
model && GBF_IS_PROJECT_MODEL (model)) {
GtkTreePath *root;
GdkRectangle rect;
@@ -263,9 +263,8 @@ expose_event (GtkWidget *widget, GdkEventExpose *ev)
gtk_tree_view_get_background_area (
tree_view, root, gtk_tree_view_get_column (tree_view, 0), &rect);
gtk_paint_hline (gtk_widget_get_style (widget),
- ev->window,
+ cr,
gtk_widget_get_state (widget),
- &ev->area,
widget,
"",
rect.x, rect.x + rect.width,
@@ -281,17 +280,15 @@ static void
gbf_project_view_class_init (GbfProjectViewClass *klass)
{
GObjectClass *g_object_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkTreeViewClass *tree_view_class;
g_object_class = G_OBJECT_CLASS (klass);
- object_class = (GtkObjectClass *) klass;
widget_class = GTK_WIDGET_CLASS (klass);
tree_view_class = GTK_TREE_VIEW_CLASS (klass);
- object_class->destroy = destroy;
- widget_class->expose_event = expose_event;
+ widget_class->destroy = destroy;
+ widget_class->draw = draw;
tree_view_class->row_activated = row_activated;
signals [URI_ACTIVATED] =
diff --git a/plugins/project-wizard/druid.c b/plugins/project-wizard/druid.c
index a52953e..041d70e 100644
--- a/plugins/project-wizard/druid.c
+++ b/plugins/project-wizard/druid.c
@@ -770,7 +770,7 @@ static gboolean
on_project_wizard_key_press_event(GtkWidget *widget, GdkEventKey *event,
NPWDruid* druid)
{
- if (event->keyval == GDK_Escape)
+ if (event->keyval == GDK_KEY_Escape)
{
on_druid_cancel (GTK_ASSISTANT (widget), druid);
return TRUE;
diff --git a/plugins/project-wizard/property.c b/plugins/project-wizard/property.c
index b0ca9c2..0b3a060 100644
--- a/plugins/project-wizard/property.c
+++ b/plugins/project-wizard/property.c
@@ -536,10 +536,10 @@ npw_property_create_widget (NPWProperty* prop)
GSList* node;
gboolean get_value = FALSE;
- entry = gtk_combo_box_entry_new_text ();
+ entry = gtk_combo_box_text_new_with_entry ();
for (node = prop->items; node != NULL; node = node->next)
{
- gtk_combo_box_append_text (GTK_COMBO_BOX (entry), npw_item_get_label((NPWItem *)node->data));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (entry), npw_item_get_label((NPWItem *)node->data));
if ((value != NULL) && !get_value && (strcmp (value, ((NPWItem *)node->data)->name) == 0))
{
value = npw_item_get_label ((NPWItem *)node->data);
diff --git a/plugins/run-program/anjuta-run-program.ui b/plugins/run-program/anjuta-run-program.ui
index f44eac5..0b1a80a 100644
--- a/plugins/run-program/anjuta-run-program.ui
+++ b/plugins/run-program/anjuta-run-program.ui
@@ -36,12 +36,9 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxEntry" id="parameter_combo">
+ <object class="GtkComboBox" id="parameter_combo">
<property name="visible">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxentry-entry2">
- </object>
- </child>
+ <property name="has-entry">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -66,12 +63,9 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxEntry" id="target_combo">
+ <object class="GtkComboBox" id="target_combo">
<property name="visible">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxentry-entry1">
- </object>
- </child>
+ <property name="has-entry">True</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/plugins/run-program/execute.c b/plugins/run-program/execute.c
index e57f164..6a34749 100644
--- a/plugins/run-program/execute.c
+++ b/plugins/run-program/execute.c
@@ -375,7 +375,6 @@ run_program (RunProgramPlugin *plugin)
gchar **env = NULL;
gchar *cmd;
gboolean run_in_terminal = 0;
- AnjutaPreferences *prefs;
GPid pid;
target = get_local_executable (GTK_WINDOW (ANJUTA_PLUGIN (plugin)->shell),
diff --git a/plugins/run-program/parameters.c b/plugins/run-program/parameters.c
index a75a0f0..06dd79b 100644
--- a/plugins/run-program/parameters.c
+++ b/plugins/run-program/parameters.c
@@ -647,7 +647,7 @@ run_dialog_init (RunDialog *dlg, RunProgramPlugin *plugin)
/* Fill parameter combo box */
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);
+ gtk_combo_box_set_entry_text_column( GTK_COMBO_BOX(dlg->args), 0);
g_list_foreach (plugin->recent_args, on_add_string_in_model, model);
if (plugin->recent_args != NULL)
{
@@ -662,7 +662,7 @@ run_dialog_init (RunDialog *dlg, RunProgramPlugin *plugin)
/* Fill target combo box */
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);
+ gtk_combo_box_set_entry_text_column( GTK_COMBO_BOX (dlg->target), 0);
g_list_foreach (plugin->recent_target, on_add_uri_in_model, model);
anjuta_shell_get_value (ANJUTA_PLUGIN (plugin)->shell, IANJUTA_PROJECT_MANAGER_PROJECT_ROOT_URI, &value, NULL);
diff --git a/plugins/search/anjuta-search.ui b/plugins/search/anjuta-search.ui
index d3d6a1e..304fb8a 100644
--- a/plugins/search/anjuta-search.ui
+++ b/plugins/search/anjuta-search.ui
@@ -66,8 +66,9 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxEntry" id="replace.string.combo">
+ <object class="GtkComboBox" id="replace.string.combo">
<property name="visible">True</property>
+ <property name="has-entry">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -93,8 +94,9 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxEntry" id="search.string.combo">
+ <object class="GtkComboBox" id="search.string.combo">
<property name="visible">True</property>
+ <property name="has-entry">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -490,6 +492,7 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
+ <property name="active">True</property>
<signal name="clicked" handler="on_actions_no_limit_clicked" swapped="no"/>
</object>
<packing>
@@ -568,8 +571,9 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkComboBoxEntry" id="search.var.combo">
+ <object class="GtkComboBox" id="search.var.combo">
<property name="visible">True</property>
+ <property name="has-entry">True</property>
<property name="model">model1</property>
<child>
<object class="GtkCellRendererText" id="renderer1"/>
@@ -609,8 +613,9 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <object class="GtkComboBoxEntry" id="dir.filter.unmatch.combo">
+ <object class="GtkComboBox" id="dir.filter.unmatch.combo">
<property name="visible">True</property>
+ <property name="has-entry">True</property>
<property name="model">model2</property>
<child>
<object class="GtkCellRendererText" id="renderer2"/>
@@ -628,8 +633,9 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxEntry" id="dir.filter.match.combo">
+ <object class="GtkComboBox" id="dir.filter.match.combo">
<property name="visible">True</property>
+ <property name="has-entry">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -640,8 +646,9 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxEntry" id="file.filter.unmatch.combo">
+ <object class="GtkComboBox" id="file.filter.unmatch.combo">
<property name="visible">True</property>
+ <property name="has-entry">True</property>
<property name="model">model3</property>
<child>
<object class="GtkCellRendererText" id="renderer3"/>
@@ -659,8 +666,9 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxEntry" id="file.filter.match.combo">
+ <object class="GtkComboBox" id="file.filter.match.combo">
<property name="visible">True</property>
+ <property name="has-entry">True</property>
<property name="model">model4</property>
<child>
<object class="GtkCellRendererText" id="renderer4"/>
diff --git a/plugins/search/search-replace.c b/plugins/search/search-replace.c
index 0907e05..a3313d4 100644
--- a/plugins/search/search-replace.c
+++ b/plugins/search/search-replace.c
@@ -828,7 +828,7 @@ sr_get_gladewidget(GladeWidgetId id)
}
static void
-search_set_popdown_strings (GtkComboBoxEntry *combo, GList* strings)
+search_set_popdown_strings (GtkComboBox* combo, GList* strings)
{
GtkListStore *store;
gboolean init;
@@ -846,7 +846,7 @@ search_set_popdown_strings (GtkComboBoxEntry *combo, GList* strings)
gtk_combo_box_set_model (GTK_COMBO_BOX(combo), GTK_TREE_MODEL (store));
g_object_unref (store);
- if (init) gtk_combo_box_entry_set_text_column (combo, 0);
+ if (init) gtk_combo_box_set_entry_text_column (combo, 0);
}
static void
@@ -1407,7 +1407,7 @@ search_update_combos(void)
search_word);
sr->search.expr_history = list_max_items(sr->search.expr_history,
MAX_ITEMS_SEARCH_COMBO);
- search_set_popdown_strings(GTK_COMBO_BOX_ENTRY (search_list),
+ search_set_popdown_strings(GTK_COMBO_BOX (search_list),
sr->search.expr_history);
//search_toolbar_set_text(search_word);
@@ -1444,7 +1444,7 @@ replace_update_combos(void)
replace_word);
sr->replace.expr_history = list_max_items(sr->replace.expr_history,
MAX_ITEMS_SEARCH_COMBO);
- search_set_popdown_strings(GTK_COMBO_BOX_ENTRY (replace_list),
+ search_set_popdown_strings(GTK_COMBO_BOX (replace_list),
sr->replace.expr_history);
}
}
@@ -1520,7 +1520,7 @@ gboolean
on_search_dialog_key_press_event(GtkWidget *widget, GdkEventKey *event,
gpointer user_data)
{
- if (event->keyval == GDK_Escape)
+ if (event->keyval == GDK_KEY_Escape)
{
if (user_data)
{
@@ -1538,7 +1538,7 @@ on_search_dialog_key_press_event(GtkWidget *widget, GdkEventKey *event,
else
{
if ( (event->state & GDK_CONTROL_MASK) &&
- ((event->keyval & 0x5F) == GDK_G))
+ ((event->keyval & 0x5F) == GDK_KEY_G))
{
if (event->state & GDK_SHIFT_MASK)
search_replace_previous();
diff --git a/plugins/snippets-manager/plugin.c b/plugins/snippets-manager/plugin.c
index 184eb04..22f7e6e 100644
--- a/plugins/snippets-manager/plugin.c
+++ b/plugins/snippets-manager/plugin.c
@@ -437,13 +437,13 @@ snippets_manager_plugin_instance_init (GObject * obj)
snippets_provider_new (snippets_manager->snippets_db,
snippets_manager->snippets_interaction);
- g_signal_connect (GTK_OBJECT (snippets_manager->snippets_browser),
+ g_signal_connect (G_OBJECT (snippets_manager->snippets_browser),
"maximize-request",
- GTK_SIGNAL_FUNC (on_snippets_browser_maximize_request),
+ G_CALLBACK (on_snippets_browser_maximize_request),
snippets_manager);
- g_signal_connect (GTK_OBJECT (snippets_manager->snippets_browser),
+ g_signal_connect (G_OBJECT (snippets_manager->snippets_browser),
"unmaximize-request",
- GTK_SIGNAL_FUNC (on_snippets_browser_unmaximize_request),
+ G_CALLBACK (on_snippets_browser_unmaximize_request),
snippets_manager);
}
@@ -762,9 +762,9 @@ set_up_global_variables_view (SnippetsManagerPlugin *snippets_manager_plugin,
global_vars_view_name_data_func,
NULL, NULL);
gtk_tree_view_append_column (global_vars_view, col);
- g_signal_connect (GTK_OBJECT (cell),
+ g_signal_connect (G_OBJECT (cell),
"edited",
- GTK_SIGNAL_FUNC (on_global_vars_name_changed),
+ G_CALLBACK (on_global_vars_name_changed),
snippets_manager_plugin->snippets_db);
/* Set up the type cell */
@@ -778,9 +778,9 @@ set_up_global_variables_view (SnippetsManagerPlugin *snippets_manager_plugin,
global_vars_view_type_data_func,
NULL, NULL);
gtk_tree_view_append_column (global_vars_view, col);
- g_signal_connect (GTK_OBJECT (cell),
+ g_signal_connect (G_OBJECT (cell),
"toggled",
- GTK_SIGNAL_FUNC (on_global_vars_type_toggled),
+ G_CALLBACK (on_global_vars_type_toggled),
snippets_manager_plugin->snippets_db);
/* Set up the text cell */
@@ -795,9 +795,9 @@ set_up_global_variables_view (SnippetsManagerPlugin *snippets_manager_plugin,
snippets_manager_plugin->snippets_db,
NULL);
gtk_tree_view_append_column (global_vars_view, col);
- g_signal_connect (GTK_OBJECT (cell),
+ g_signal_connect (G_OBJECT (cell),
"edited",
- GTK_SIGNAL_FUNC (on_global_vars_text_changed),
+ G_CALLBACK (on_global_vars_text_changed),
snippets_manager_plugin->snippets_db);
/* Set up the instant value cell */
@@ -952,14 +952,14 @@ ipreferences_merge (IAnjutaPreferences* ipref,
global_vars_update_data->snippets_db = snippets_manager_plugin->snippets_db;
global_vars_update_data->global_vars_view = global_vars_view;
- g_signal_connect (GTK_OBJECT (add_variable_b),
+ g_signal_connect (G_OBJECT (add_variable_b),
"clicked",
- GTK_SIGNAL_FUNC (on_add_variable_b_clicked),
+ G_CALLBACK (on_add_variable_b_clicked),
global_vars_update_data);
- g_signal_connect (GTK_OBJECT (delete_variable_b),
+ g_signal_connect (G_OBJECT (delete_variable_b),
"clicked",
- GTK_SIGNAL_FUNC (on_delete_variable_b_clicked),
+ G_CALLBACK (on_delete_variable_b_clicked),
global_vars_update_data);
g_object_unref (bxml);
diff --git a/plugins/snippets-manager/snippets-browser.c b/plugins/snippets-manager/snippets-browser.c
index 5efb485..f813d2e 100644
--- a/plugins/snippets-manager/snippets-browser.c
+++ b/plugins/snippets-manager/snippets-browser.c
@@ -258,41 +258,41 @@ init_browser_handlers (SnippetsBrowser *snippets_browser)
g_return_if_fail (ANJUTA_IS_SNIPPETS_BROWSER (snippets_browser));
priv = ANJUTA_SNIPPETS_BROWSER_GET_PRIVATE (snippets_browser);
- g_signal_connect (GTK_OBJECT (priv->snippets_view),
+ g_signal_connect (priv->snippets_view,
"row-activated",
- GTK_SIGNAL_FUNC (on_snippets_view_row_activated),
+ G_CALLBACK (on_snippets_view_row_activated),
snippets_browser);
- g_signal_connect (GTK_OBJECT (priv->snippets_view),
+ g_signal_connect (priv->snippets_view,
"query-tooltip",
- GTK_SIGNAL_FUNC (on_snippets_view_query_tooltip),
+ G_CALLBACK (on_snippets_view_query_tooltip),
snippets_browser);
g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (priv->snippets_view)),
"changed",
G_CALLBACK (on_snippets_view_selection_changed),
snippets_browser);
- g_signal_connect (GTK_OBJECT (priv->add_button),
+ g_signal_connect (priv->add_button,
"clicked",
- GTK_SIGNAL_FUNC (on_add_button_clicked),
+ G_CALLBACK (on_add_button_clicked),
snippets_browser);
- g_signal_connect (GTK_OBJECT (priv->delete_button),
+ g_signal_connect (priv->delete_button,
"clicked",
- GTK_SIGNAL_FUNC (on_delete_button_clicked),
+ G_CALLBACK (on_delete_button_clicked),
snippets_browser);
- g_signal_connect (GTK_OBJECT (priv->insert_button),
+ g_signal_connect (priv->insert_button,
"clicked",
- GTK_SIGNAL_FUNC (on_insert_button_clicked),
+ G_CALLBACK (on_insert_button_clicked),
snippets_browser);
- g_signal_connect (GTK_OBJECT (priv->edit_button),
+ g_signal_connect (priv->edit_button,
"toggled",
- GTK_SIGNAL_FUNC (on_edit_button_toggled),
+ G_CALLBACK (on_edit_button_toggled),
snippets_browser);
- g_signal_connect (GTK_OBJECT (priv->snippets_editor),
+ g_signal_connect (priv->snippets_editor,
"snippet-saved",
- GTK_SIGNAL_FUNC (on_snippets_editor_snippet_saved),
+ G_CALLBACK (on_snippets_editor_snippet_saved),
snippets_browser);
- g_signal_connect (GTK_OBJECT (priv->snippets_editor),
+ g_signal_connect (priv->snippets_editor,
"close-request",
- GTK_SIGNAL_FUNC (on_snippets_editor_close_request),
+ G_CALLBACK (on_snippets_editor_close_request),
snippets_browser);
/* Set the has-tooltip property for the query-tooltip signal */
@@ -536,9 +536,9 @@ init_snippets_view (SnippetsBrowser *snippets_browser)
gtk_tree_view_column_set_cell_data_func (column, text_renderer,
snippets_view_name_text_data_func,
snippets_browser, NULL);
- g_signal_connect (GTK_OBJECT (text_renderer),
+ g_signal_connect (text_renderer,
"edited",
- GTK_SIGNAL_FUNC (on_name_changed),
+ G_CALLBACK (on_name_changed),
snippets_browser);
g_object_set (G_OBJECT (column), "resizable", TRUE, NULL);
gtk_tree_view_insert_column (priv->snippets_view, column, -1);
@@ -806,9 +806,9 @@ on_add_button_clicked (GtkButton *add_button,
/* Insert the Add Snippet menu item */
add_snippet_menu_item = gtk_menu_item_new_with_label (_("Add Snippet â?¦"));
- g_signal_connect (GTK_OBJECT (add_snippet_menu_item),
+ g_signal_connect (add_snippet_menu_item,
"activate",
- GTK_SIGNAL_FUNC (on_add_snippet_menu_item_activated),
+ G_CALLBACK (on_add_snippet_menu_item_activated),
snippets_browser);
gtk_menu_shell_append (GTK_MENU_SHELL (menu),
GTK_WIDGET (add_snippet_menu_item));
@@ -816,9 +816,9 @@ on_add_button_clicked (GtkButton *add_button,
/* Insert the Add Snippets Group menu item */
add_snippets_group_menu_item = gtk_menu_item_new_with_label (_("Add Snippets Group â?¦"));
- g_signal_connect (GTK_OBJECT (add_snippets_group_menu_item),
+ g_signal_connect (add_snippets_group_menu_item,
"activate",
- GTK_SIGNAL_FUNC (on_add_snippets_group_menu_item_activated),
+ G_CALLBACK (on_add_snippets_group_menu_item_activated),
snippets_browser);
gtk_menu_shell_append (GTK_MENU_SHELL (menu),
GTK_WIDGET (add_snippets_group_menu_item));
diff --git a/plugins/snippets-manager/snippets-editor.c b/plugins/snippets-manager/snippets-editor.c
index 2c9b5eb..fa4335c 100644
--- a/plugins/snippets-manager/snippets-editor.c
+++ b/plugins/snippets-manager/snippets-editor.c
@@ -874,7 +874,7 @@ reload_snippets_group_combo_box (SnippetsEditor *snippets_editor)
SNIPPETS_DB_MODEL_COL_NAME, &cur_group_name,
-1);
- gtk_combo_box_append_text (priv->snippets_group_combo_box, cur_group_name);
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->snippets_group_combo_box), cur_group_name);
/* If we have a snippet loaded, we search for the row. */
if (parent_group_name != NULL)
@@ -1273,17 +1273,17 @@ init_editor_handlers (SnippetsEditor *snippets_editor)
g_return_if_fail (ANJUTA_IS_SNIPPETS_EDITOR (snippets_editor));
priv = ANJUTA_SNIPPETS_EDITOR_GET_PRIVATE (snippets_editor);
- g_signal_connect (GTK_OBJECT (priv->preview_button),
+ g_signal_connect (G_OBJECT (priv->preview_button),
"toggled",
- GTK_SIGNAL_FUNC (on_preview_button_toggled),
+ G_CALLBACK (on_preview_button_toggled),
snippets_editor);
- g_signal_connect (GTK_OBJECT (priv->save_button),
+ g_signal_connect (G_OBJECT (priv->save_button),
"clicked",
- GTK_SIGNAL_FUNC (on_save_button_clicked),
+ G_CALLBACK (on_save_button_clicked),
snippets_editor);
- g_signal_connect (GTK_OBJECT (priv->close_button),
+ g_signal_connect (G_OBJECT (priv->close_button),
"clicked",
- GTK_SIGNAL_FUNC (on_close_button_clicked),
+ G_CALLBACK (on_close_button_clicked),
snippets_editor);
g_signal_connect (G_OBJECT (priv->name_combo_cell),
"edited",
@@ -1297,21 +1297,21 @@ init_editor_handlers (SnippetsEditor *snippets_editor)
"edited",
G_CALLBACK (on_default_text_cell_edited),
snippets_editor);
- g_signal_connect (GTK_OBJECT (priv->variables_view),
+ g_signal_connect (G_OBJECT (priv->variables_view),
"row-activated",
- GTK_SIGNAL_FUNC (on_variables_view_row_activated),
+ G_CALLBACK (on_variables_view_row_activated),
snippets_editor);
- g_signal_connect (GTK_OBJECT (priv->variable_add_button),
+ g_signal_connect (G_OBJECT (priv->variable_add_button),
"clicked",
- GTK_SIGNAL_FUNC (on_variable_add_button_clicked),
+ G_CALLBACK (on_variable_add_button_clicked),
snippets_editor);
- g_signal_connect (GTK_OBJECT (priv->variable_remove_button),
+ g_signal_connect (G_OBJECT (priv->variable_remove_button),
"clicked",
- GTK_SIGNAL_FUNC (on_variable_remove_button_clicked),
+ G_CALLBACK (on_variable_remove_button_clicked),
snippets_editor);
- g_signal_connect (GTK_OBJECT (priv->variable_insert_button),
+ g_signal_connect (G_OBJECT (priv->variable_insert_button),
"clicked",
- GTK_SIGNAL_FUNC (on_variable_insert_button_clicked),
+ G_CALLBACK (on_variable_insert_button_clicked),
snippets_editor);
g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (priv->variables_view)),
"changed",
diff --git a/plugins/sourceview/anjuta-view.c b/plugins/sourceview/anjuta-view.c
index 5b44da6..1db75df 100644
--- a/plugins/sourceview/anjuta-view.c
+++ b/plugins/sourceview/anjuta-view.c
@@ -79,8 +79,8 @@ static void anjuta_view_move_cursor (GtkTextView *text_view,
static gint anjuta_view_focus_out (GtkWidget *widget,
GdkEventFocus *event);
-static gint anjuta_view_expose (GtkWidget *widget,
- GdkEventExpose *event);
+static gboolean anjuta_view_draw (GtkWidget *widget,
+ cairo_t* cr);
static gboolean anjuta_view_key_press_event (GtkWidget *widget,
GdkEventKey *event);
@@ -258,7 +258,7 @@ anjuta_view_class_init (AnjutaViewClass *klass)
object_class->get_property = anjuta_view_get_property;
widget_class->focus_out_event = anjuta_view_focus_out;
- widget_class->expose_event = anjuta_view_expose;
+ widget_class->draw = anjuta_view_draw;
widget_class->key_press_event = anjuta_view_key_press_event;
widget_class->button_press_event = anjuta_view_button_press_event;
widget_class->drag_drop = anjuta_view_drag_drop;
@@ -638,9 +638,9 @@ anjuta_view_set_font (AnjutaView *view,
}
}
-static gint
-anjuta_view_expose (GtkWidget *widget,
- GdkEventExpose *event)
+static gboolean
+anjuta_view_draw (GtkWidget *widget,
+ cairo_t *cr)
{
GtkTextView *text_view;
GtkTextBuffer *doc;
@@ -649,7 +649,7 @@ anjuta_view_expose (GtkWidget *widget,
doc = gtk_text_view_get_buffer (text_view);
- if ((event->window == gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT)))
+ if (gtk_cairo_should_draw_window (cr, gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT)))
{
GdkRectangle visible_rect;
GtkTextIter iter1, iter2;
@@ -663,7 +663,7 @@ anjuta_view_expose (GtkWidget *widget,
gtk_text_iter_forward_line (&iter2);
}
- return (* GTK_WIDGET_CLASS (anjuta_view_parent_class)->expose_event)(widget, event);
+ return (* GTK_WIDGET_CLASS (anjuta_view_parent_class)->draw)(widget, cr);
}
static gboolean
@@ -678,23 +678,23 @@ anjuta_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
assist_tip = view->priv->sv->priv->assist_tip;
switch (event->keyval)
{
- case GDK_Escape:
- case GDK_Up:
- case GDK_Down:
- case GDK_Page_Up:
- case GDK_Page_Down:
+ case GDK_KEY_Escape:
+ case GDK_KEY_Up:
+ case GDK_KEY_Down:
+ case GDK_KEY_Page_Up:
+ case GDK_KEY_Page_Down:
if (assist_tip)
{
gtk_widget_destroy (GTK_WIDGET(assist_tip));
break;
}
break;
- case GDK_F7:
+ case GDK_KEY_F7:
/* F7 is used to toggle cursor visibility but we rather like to
* use it as shortcut for building (#611204)
*/
return FALSE;
- case GDK_Return:
+ case GDK_KEY_Return:
/* Ctrl-Return is used for autocompletion */
if (event->state == GDK_CONTROL_MASK)
return FALSE;
diff --git a/plugins/sourceview/assist-tip.c b/plugins/sourceview/assist-tip.c
index ad27c72..d406563 100644
--- a/plugins/sourceview/assist-tip.c
+++ b/plugins/sourceview/assist-tip.c
@@ -136,7 +136,7 @@ assist_tip_get_coordinates(GtkWidget* view, int* x, int* y, GtkTextIter* iter, G
gtk_widget_size_request(entry, &entry_req);
/* ensure that the tip is inside the text_view */
- gdk_drawable_get_size (GDK_DRAWABLE(window), &view_width, NULL);
+ gdk_window_get_geometry (GDK_DRAWABLE(window), NULL, NULL, &view_width, NULL, NULL);
width_left = (xor + view_width) - (*x + entry_req.width);
DEBUG_PRINT ("width_left: %d", width_left);
if (width_left < 0)
diff --git a/plugins/sourceview/sourceview-prefs.c b/plugins/sourceview/sourceview-prefs.c
index b9e5ade..665e6e4 100644
--- a/plugins/sourceview/sourceview-prefs.c
+++ b/plugins/sourceview/sourceview-prefs.c
@@ -22,8 +22,6 @@
#include <libanjuta/anjuta-debug.h>
-#include <gconf/gconf-client.h>
-
#define REGISTER_NOTIFY(settings, key, func) \
g_signal_connect (settings, "changed::" key, G_CALLBACK(func), sv);
@@ -185,6 +183,8 @@ on_notify_font_theme (GSettings* settings,
if (g_settings_get_boolean (settings, key))
{
+ /* FIXME: GSettings */
+#if 0
GConfClient *gclient = gconf_client_get_default ();
gchar *desktop_fixed_font;
desktop_fixed_font =
@@ -194,6 +194,7 @@ on_notify_font_theme (GSettings* settings,
else
anjuta_view_set_font(sv->priv->view, TRUE, NULL);
g_free (desktop_fixed_font);
+#endif
}
else
{
diff --git a/plugins/starter/starter.c b/plugins/starter/starter.c
index 48fdfaf..673efbd 100644
--- a/plugins/starter/starter.c
+++ b/plugins/starter/starter.c
@@ -256,22 +256,19 @@ gnome_library_clicked_cb (GtkButton *button, gpointer useless)
}
static gboolean
-on_expose_event_cb (GtkWidget *widget, GdkEventExpose *event,
- Starter *wcm)
+on_draw_cb (GtkWidget *widget, cairo_t *cr,
+ Starter *wcm)
{
GtkAllocation allocation;
GdkWindow *window;
- cairo_t *cr;
cairo_pattern_t *pattern;
window = gtk_widget_get_window (widget);
-
- cr = gdk_cairo_create (window);
gtk_widget_get_allocation (widget, &allocation);
pattern = cairo_pattern_create_linear (0, 0, 0, allocation.height);
- if (gdk_screen_get_rgba_colormap (gtk_widget_get_screen (widget)) &&
+ if (gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget)) &&
gtk_widget_is_composited (widget))
cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.0); /* transparent */
else
@@ -291,11 +288,7 @@ on_expose_event_cb (GtkWidget *widget, GdkEventExpose *event,
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
cairo_paint (cr);
-
- cairo_destroy (cr);
-
- cr = gdk_cairo_create (window);
-
+
gdk_cairo_set_source_pixbuf (cr, wcm->priv->logo, 20, 20);
cairo_paint (cr);
@@ -306,7 +299,7 @@ on_expose_event_cb (GtkWidget *widget, GdkEventExpose *event,
list = gtk_container_get_children (GTK_CONTAINER (widget));
for (l = list; l != NULL; l = g_list_next (l))
- gtk_container_propagate_expose (GTK_CONTAINER (widget), l->data, event);
+ gtk_container_propagate_draw (GTK_CONTAINER (widget), l->data, cr);
g_list_free (list);
@@ -374,8 +367,8 @@ starter_instance_init (Starter* wcm)
wcm->priv->event_box = gtk_event_box_new ();
gtk_widget_show (wcm->priv->event_box);
- g_signal_connect (wcm->priv->event_box, "expose-event",
- G_CALLBACK (on_expose_event_cb), wcm);
+ g_signal_connect (wcm->priv->event_box, "draw",
+ G_CALLBACK (on_draw_cb), wcm);
alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
diff --git a/plugins/subversion/subversion-commit-dialog.c b/plugins/subversion/subversion-commit-dialog.c
index 5bf447d..5bfb3ec 100644
--- a/plugins/subversion/subversion-commit-dialog.c
+++ b/plugins/subversion/subversion-commit-dialog.c
@@ -105,7 +105,7 @@ on_subversion_commit_response(GtkDialog* dialog, gint response,
if (msg_enable_selected == TRUE)
{
commit_command = svn_commit_command_new (selected_paths,
- gtk_combo_box_get_active_text(GTK_COMBO_BOX(commit_prev_msg_combo)),
+ gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT (commit_prev_msg_combo)),
!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(norecurse)));
}
else
@@ -178,7 +178,7 @@ on_prev_message_enable_clicked (GtkToggleButton *button, gpointer data)
static void
subversion_commit_dialog_populate_logs (gpointer msg, gpointer user_data)
{
- gtk_combo_box_append_text(GTK_COMBO_BOX(user_data), (gchar*) msg);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(user_data), (gchar*) msg);
}
static void
diff --git a/plugins/subversion/subversion-log-dialog.c b/plugins/subversion/subversion-log-dialog.c
index 8fa091d..594254f 100644
--- a/plugins/subversion/subversion-log-dialog.c
+++ b/plugins/subversion/subversion-log-dialog.c
@@ -513,7 +513,7 @@ on_log_diff_previous_button_clicked (GtkButton *button, LogData *data)
}
static void
-on_subversion_log_vbox_destroy (GtkObject *subversion_log, LogData *data)
+on_subversion_log_vbox_destroy (GtkWidget *subversion_log, LogData *data)
{
g_hash_table_destroy (data->selected_diff_revisions);
g_free (data->path);
diff --git a/plugins/symbol-db/symbol-db-model.h b/plugins/symbol-db/symbol-db-model.h
index 3c89e73..3348436 100644
--- a/plugins/symbol-db/symbol-db-model.h
+++ b/plugins/symbol-db/symbol-db-model.h
@@ -21,7 +21,7 @@
#define _SYMBOL_DB_MODEL_H_
#include <glib-object.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
#include <libgda/gda-data-model.h>
#include "symbol-db-engine.h"
diff --git a/plugins/symbol-db/symbol-db-views.c b/plugins/symbol-db/symbol-db-views.c
index c759b75..f961179 100644
--- a/plugins/symbol-db/symbol-db-views.c
+++ b/plugins/symbol-db/symbol-db-views.c
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
#include <libanjuta/interfaces/ianjuta-document-manager.h>
#include <libanjuta/interfaces/ianjuta-markable.h>
#include "symbol-db-model-project.h"
diff --git a/plugins/terminal/terminal.c b/plugins/terminal/terminal.c
index 2bba54b..b0c12fa 100644
--- a/plugins/terminal/terminal.c
+++ b/plugins/terminal/terminal.c
@@ -62,7 +62,6 @@
#define PREFS_TERMINAL_PROFILE_USE_DEFAULT "terminal-default-profile"
#define PREFS_TERMINAL_PROFILE "terminal-profile"
-#include <gconf/gconf-client.h>
#include <vte/vte.h>
#include <vte/reaper.h>
#include <pwd.h>
@@ -120,43 +119,9 @@ get_profile_key (const gchar *profile, const gchar *key)
return buffer;
}
-static gboolean
-get_bool_default (GConfClient *client, const gchar *key, gboolean def)
-{
- gboolean value = def;
- GConfValue* val;
-
- val = gconf_client_get (client, key, NULL);
- if (val != NULL)
- {
- value = gconf_value_get_bool (val);
- gconf_value_free (val);
- }
-
- return value;
-}
-
-#define GET_PROFILE_BOOL(key) \
- gconf_client_get_bool (client, \
- get_profile_key (profile, key), \
- NULL);
-#define GET_PROFILE_BOOL_DEFAULT(key, value) \
- get_bool_default (client, \
- get_profile_key (profile, key), \
- value);
-#define GET_PROFILE_INT(key) \
- gconf_client_get_int (client, \
- get_profile_key (profile, key), \
- NULL);
-#define GET_PROFILE_STRING(key) \
- gconf_client_get_string (client, \
- get_profile_key (profile, key), \
- NULL);
-
static void
terminal_set_preferences (VteTerminal *term, GSettings* settings, TerminalPlugin *term_plugin)
{
- GConfClient *client;
char *text;
int value;
gboolean setting;
@@ -165,8 +130,6 @@ terminal_set_preferences (VteTerminal *term, GSettings* settings, TerminalPlugin
GdkColor* background;
gchar *profile;
- client = gconf_client_get_default ();
-
g_return_if_fail (client != NULL);
/* Update the currently available list of terminal profiles */
@@ -190,7 +153,7 @@ terminal_set_preferences (VteTerminal *term, GSettings* settings, TerminalPlugin
vte_terminal_set_mouse_autohide (term, TRUE);
/* Set terminal font either using the desktop wide font or g-t one. */
- setting = GET_PROFILE_BOOL (GCONF_USE_SYSTEM_FONT);
+ setting = g_settings_get_boolean (GCONF_USE_SYSTEM_FONT);
if (setting) {
text = gconf_client_get_string (client, GCONF_MONOSPACE_FONT, NULL);
if (!text)
diff --git a/plugins/tools/editor.c b/plugins/tools/editor.c
index d67286e..e802b7a 100644
--- a/plugins/tools/editor.c
+++ b/plugins/tools/editor.c
@@ -981,18 +981,18 @@ on_editor_get_keys(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
switch (event->keyval)
{
- case GDK_Shift_L:
- case GDK_Shift_R:
- case GDK_Control_L:
- case GDK_Control_R:
- case GDK_Alt_L:
- case GDK_Alt_R:
+ case GDK_KEY_Shift_L:
+ case GDK_KEY_Shift_R:
+ case GDK_KEY_Control_L:
+ case GDK_KEY_Control_R:
+ case GDK_KEY_Alt_L:
+ case GDK_KEY_Alt_R:
return TRUE;
- case GDK_Escape:
+ case GDK_KEY_Escape:
break;
- case GDK_Delete:
- case GDK_KP_Delete:
- case GDK_BackSpace:
+ case GDK_KEY_Delete:
+ case GDK_KEY_KP_Delete:
+ case GDK_KEY_BackSpace:
delete = TRUE;
break;
default:
diff --git a/src/Makefile.am b/src/Makefile.am
index be38dbc..9374a8e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,11 +42,10 @@ anjuta_SOURCES = \
main.c
anjuta_LDADD = \
- $(GCONF_LIBS) \
$(GDL_LIBS) \
$(GLADE_LIBS)\
$(GLIB_LIBS) \
- $(top_builddir)/libanjuta/libanjuta.la
+ $(LIBANJUTA_LIBS)
anjuta_LDFLAGS = $(ANJUTA_LDFLAGS)
@@ -59,7 +58,7 @@ noinst_PROGRAMS = anjuta-shell
anjuta_shell_SOURCES = shell.c shell.h
anjuta_shell_LDADD = \
- $(top_builddir)/libanjuta/libanjuta.la
+ $(LIBANJUTA_LIBS)
EXTRA_DIST = \
$(anjuta_ui_DATA) \
diff --git a/src/anjuta-app.c b/src/anjuta-app.c
index e4362fc..8cf4ef7 100644
--- a/src/anjuta-app.c
+++ b/src/anjuta-app.c
@@ -725,18 +725,18 @@ anjuta_app_key_press_event (GtkWidget *widget,
switch (event->keyval)
{
- case GDK_F1:
- case GDK_F2:
- case GDK_F3:
- case GDK_F4:
- case GDK_F5:
- case GDK_F6:
- case GDK_F7:
- case GDK_F8:
- case GDK_F9:
- case GDK_F10:
- case GDK_F11:
- case GDK_F12:
+ case GDK_KEY_F1:
+ case GDK_KEY_F2:
+ case GDK_KEY_F3:
+ case GDK_KEY_F4:
+ case GDK_KEY_F5:
+ case GDK_KEY_F6:
+ case GDK_KEY_F7:
+ case GDK_KEY_F8:
+ case GDK_KEY_F9:
+ case GDK_KEY_F10:
+ case GDK_KEY_F11:
+ case GDK_KEY_F12:
/* handle mnemonics and accelerators */
if (!handled)
handled = gtk_window_activate_key (window, event);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
