dia r4191 - in trunk: . app

[hans svn gnome org]

Author: hans
Date: Sun Jan 11 21:33:26 2009
New Revision: 4191
URL: http://svn.gnome.org/viewvc/dia?rev=4191&view=rev

Log:
2009-01-11  Hans Breuer  <hans breuer org>

	[make "./configure ---enable-gnome=yes" work again]
	* app/interface.h : was including too much e.g. itself and gnome.h. 
	The latter gave compiling errors for --enable-gnome=yes
	* app/interface.c app/commands.c app/recent_files.c app/display.c
	  app/app_procs.c app/disp_callbacks.c : updated accordingly, basically
	adding #undef GTK_DISABLE_DEPRECATED before inclusing gnome.h but also
	adjusting include order (gnome before gtk) to make it have an effect



Modified:
   trunk/ChangeLog
   trunk/app/app_procs.c
   trunk/app/commands.c
   trunk/app/disp_callbacks.c
   trunk/app/display.c
   trunk/app/interface.c
   trunk/app/interface.h
   trunk/app/recent_files.c

Modified: trunk/app/app_procs.c
==============================================================================
--- trunk/app/app_procs.c	(original)
+++ trunk/app/app_procs.c	Sun Jan 11 21:33:26 2009
@@ -34,13 +34,15 @@
 #include <png.h> /* just for the version stuff */
 #endif
 
-#include <gtk/gtk.h>
-#include <gmodule.h>
-
 #ifdef GNOME
+#undef GTK_DISABLE_DEPRECATED
+/* /usr/include/libgnomeui-2.0/libgnomeui/gnome-entry.h:58: error: expected specifier-qualifier-list before 'GtkCombo' */
 #include <gnome.h>
 #endif
 
+#include <gtk/gtk.h>
+#include <gmodule.h>
+
 #ifdef HAVE_FREETYPE
 #include <pango/pangoft2.h>
 #endif

Modified: trunk/app/commands.c
==============================================================================
--- trunk/app/commands.c	(original)
+++ trunk/app/commands.c	Sun Jan 11 21:33:26 2009
@@ -27,15 +27,17 @@
 #include <math.h>
 #include <glib.h>
 
-#include <textedit.h>
-#include <focus.h>
+#ifdef GNOME
+#undef GTK_DISABLE_DEPRECATED
+#  include <gnome.h> 	 
+#endif 	 
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 
- #ifdef GNOME 	 
- #  include <gnome.h> 	 
- #endif 	 
+#include <textedit.h>
+#include <focus.h>
+
 
 /** Functions called on menu selects.
  *  Note that GTK (at least up to 2.12) doesn't disable the keyboard shortcuts

Modified: trunk/app/disp_callbacks.c
==============================================================================
--- trunk/app/disp_callbacks.c	(original)
+++ trunk/app/disp_callbacks.c	Sun Jan 11 21:33:26 2009
@@ -23,12 +23,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
 #ifdef GNOME
+#undef GTK_DISABLE_DEPRECATED
 #include <gnome.h>
 #endif
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
 #include "display.h"
 #include "diagram.h"
 #include "tool.h"

Modified: trunk/app/display.c
==============================================================================
--- trunk/app/display.c	(original)
+++ trunk/app/display.c	Sun Jan 11 21:33:26 2009
@@ -23,12 +23,14 @@
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
-#include <gdk/gdkkeysyms.h>
 
 #ifdef GNOME
+#undef GTK_DISABLE_DEPRECATED
 #include <gnome.h>
 #endif
 
+#include <gdk/gdkkeysyms.h>
+
 #include "intl.h"
 
 #include "display.h"

Modified: trunk/app/interface.c
==============================================================================
--- trunk/app/interface.c	(original)
+++ trunk/app/interface.c	Sun Jan 11 21:33:26 2009
@@ -18,8 +18,14 @@
 
 #include <config.h>
 
+#ifdef GNOME
+#undef GTK_DISABLE_DEPRECATED /* gnome */
+#include <gnome.h>
+#else
 #undef GTK_DISABLE_DEPRECATED /* GtkTooltips */
 #include <gtk/gtk.h>
+#endif
+#include "gtkwrapbox.h"
 
 #include <stdio.h>
 #include <string.h>

Modified: trunk/app/interface.h
==============================================================================
--- trunk/app/interface.h	(original)
+++ trunk/app/interface.h	Sun Jan 11 21:33:26 2009
@@ -20,12 +20,6 @@
 
 #include "display.h"
 
-#ifdef GNOME
-#include <gnome.h>
-#endif
-#include "gtkhwrapbox.h"
-#include "intl.h"
-#include "interface.h"
 #include "menus.h"
 #include "disp_callbacks.h"
 #include "tool.h"

Modified: trunk/app/recent_files.c
==============================================================================
--- trunk/app/recent_files.c	(original)
+++ trunk/app/recent_files.c	Sun Jan 11 21:33:26 2009
@@ -24,6 +24,7 @@
 #endif
 
 #ifdef GNOME
+#undef GTK_DISABLE_DEPRECATED /* gnome */
 #include <gnome.h>
 #else
 #include <gdk/gdkkeysyms.h>