[dia] Better encapsulation of deprecated widget usage

[Hans Breuer <hans src gnome org>]

commit 33938f1838d4f56ccf7d6e2f3be272a644f82214
Author: Hans Breuer <hans breuer org>
Date:   Sat Aug 14 19:57:11 2010 +0200

    Better encapsulation of deprecated widget usage
    
    Avoid including sheets.h in menus.c, which forced us to
    did fix this.

 app/commands.h |    3 +++
 app/menus.c    |    2 --
 app/sheets.c   |    2 +-
 app/sheets.h   |    2 --
 4 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/app/commands.h b/app/commands.h
index f37147e..a770e1a 100644
--- a/app/commands.h
+++ b/app/commands.h
@@ -91,6 +91,9 @@ void objects_align_v_callback           (GtkAction *action);
 void dialogs_properties_callback (GtkAction *action);
 void dialogs_layers_callback     (GtkAction *action);
 
+/* from sheets.c */
+void sheets_dialog_show_callback(GtkAction *action);
+
 void dia_file_open (const gchar *filename, DiaImportFilter *ifilter);
 
 #endif /* COMMANDS_H */
diff --git a/app/menus.c b/app/menus.c
index 5b180d7..3bc5851 100644
--- a/app/menus.c
+++ b/app/menus.c
@@ -21,7 +21,6 @@
 #include <config.h>
 #endif
 
-#undef GTK_DISABLE_DEPRECATED /* watch out sheets.h dragging in gnome.h */
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
@@ -39,7 +38,6 @@
 #include "select.h"
 #include "dia_dirs.h"
 #include "object_ops.h"
-#include "sheets.h"
 #include "dia-app-icons.h"
 #include "widgets.h"
 #include "preferences.h"
diff --git a/app/sheets.c b/app/sheets.c
index f8e3037..e108b94 100644
--- a/app/sheets.c
+++ b/app/sheets.c
@@ -458,7 +458,7 @@ create_pixmap(GtkWidget *dialog, gchar *filename, gboolean arg3)
 /* The menu calls us here, after we've been instantiated */
 
 void
-sheets_dialog_show_callback(gpointer data, guint action, GtkWidget *widget)
+sheets_dialog_show_callback(GtkAction *action)
 {
   GtkWidget *wrapbox;
   GtkWidget *option_menu;
diff --git a/app/sheets.h b/app/sheets.h
index f494b67..93ef8e2 100644
--- a/app/sheets.h
+++ b/app/sheets.h
@@ -83,8 +83,6 @@ void create_object_pixmap(SheetObject *so, GtkWidget *parent,
 gchar *sheet_object_mod_get_type_string(SheetObjectMod *som);
 
 gboolean sheets_dialog_create(void);
-void sheets_dialog_show_callback(gpointer data, guint action,
-                                 GtkWidget *widget);
 GtkWidget *lookup_widget(GtkWidget       *widget,
                          const gchar     *widget_name);
 GtkWidget *create_pixmap(GtkWidget *dialog, gchar *filename, gboolean arg3);