dia r3952 - in trunk: . app lib objects/Misc

[hans svn gnome org]

Author: hans
Date: Fri Apr 25 12:34:14 2008
New Revision: 3952
URL: http://svn.gnome.org/viewvc/dia?rev=3952&view=rev

Log:
2008-04-25  Hans Breuer  <hans breuer org>

	* objects/misc/misc.c : remove registration of newgroup here
	* app/app_procs.c : use USE_NEWGROUP to conditionally register 
	newgroup_type (default disabled, because it is unfinished) ...
	* lib/newgroup.h : ... make newgroup_type a DIAVAR to be useable 
	in principle on win32. Together fixes bug #505513 
	* lib/newgroup.c : #warning is a gcc extension, conditionalize
	* lib/makefile.msc : build newgroup.obj


Modified:
   trunk/ChangeLog
   trunk/app/app_procs.c
   trunk/lib/makefile.msc
   trunk/lib/newgroup.c
   trunk/lib/newgroup.h
   trunk/objects/Misc/libmisc.c

Modified: trunk/app/app_procs.c
==============================================================================
--- trunk/app/app_procs.c	(original)
+++ trunk/app/app_procs.c	Fri Apr 25 12:34:14 2008
@@ -77,6 +77,7 @@
 #include "sheets.h"
 #include "utils.h"
 #include "exit_dialog.h"
+#include "newgroup.h"
 
 #if defined(HAVE_LIBPNG) && defined(HAVE_LIBART)
 extern DiaExportFilter png_export_filter;
@@ -1129,6 +1130,9 @@
 
   /* register the group object type */
   object_register_type(&group_type);
+#ifdef USE_NEWGROUP
+  object_register_type(&newgroup_type);
+#endif
 
   /* register import filters */
   filter_register_import(&dia_import_filter);

Modified: trunk/lib/makefile.msc
==============================================================================
--- trunk/lib/makefile.msc	(original)
+++ trunk/lib/makefile.msc	Fri Apr 25 12:34:14 2008
@@ -77,6 +77,7 @@
 	group.obj \
 	intl.obj \
 	message.obj \
+	newgroup.obj \
 	neworth_conn.obj \
 	objchange.obj \
 	object.obj \

Modified: trunk/lib/newgroup.c
==============================================================================
--- trunk/lib/newgroup.c	(original)
+++ trunk/lib/newgroup.c	Fri Apr 25 12:34:14 2008
@@ -111,7 +111,11 @@
   (GetPropsFunc)        newgroup_get_props,
   (SetPropsFunc)        newgroup_set_props,
   (TextEditFunc) 0,
+#ifdef __GNUC__
   #warning NewGroup requires a function in the vtable to apply props
+#else
+  #pragma message("warning: NewGroup requires a function in the vtable to apply props")
+#endif
 };
 
 static PropDescription newgroup_props[] = {

Modified: trunk/lib/newgroup.h
==============================================================================
--- trunk/lib/newgroup.h	(original)
+++ trunk/lib/newgroup.h	Fri Apr 25 12:34:14 2008
@@ -18,7 +18,11 @@
 
 #ifndef NEWGROUP_H
 #define NEWGROUP_H
+
+#include "diavar.h"
 /*
 #define USE_NEWGROUP 1
 */
+DIAVAR DiaObjectType newgroup_type;
+
 #endif

Modified: trunk/objects/Misc/libmisc.c
==============================================================================
--- trunk/objects/Misc/libmisc.c	(original)
+++ trunk/objects/Misc/libmisc.c	Fri Apr 25 12:34:14 2008
@@ -30,10 +30,6 @@
 
 extern DiaObjectType analog_clock_type;
 extern DiaObjectType tree_type;
-#ifndef _MSC_VER
-/** Taken from app, but here while testing. */
-extern DiaObjectType newgroup_type;
-#endif
 
 DIA_PLUGIN_CHECK_INIT
 
@@ -46,9 +42,6 @@
 
   object_register_type(&analog_clock_type);  
   object_register_type(&tree_type);
-#ifndef _MSC_VER
-  object_register_type(&newgroup_type);
-#endif
 
   return DIA_PLUGIN_INIT_OK;
 }