dia r4270 - in trunk: . app lib objects/AADL plug-ins/wmf

[hans svn gnome org]

Author: hans
Date: Sun Feb  8 22:39:06 2009
New Revision: 4270
URL: http://svn.gnome.org/viewvc/dia?rev=4270&view=rev

Log:
2009-02-08  Hans Breuer  <hans breuer org>

	* lib/diagramdata.c : signed/unsigned mismatch
	* lib/diagdkrenderer.c : different 'const' qualifiers
	* lib/persistence.[ch] lib/message.c : constness
	* app/autosave.c : doe not take a GCallback, but a GSourseFunc
	* app/layer_dialog.c : gtk_button_set_image() takes a GtkWidget*
	* app/textedit.c : s/ObjectChangeApplyFunc/UndoApplyFunc/ etc.
	* plug-ins/wmf/wmf.cpp : explicit cast 'gunichar2 *' to 'W32::LPCWSTR'


Modified:
   trunk/ChangeLog
   trunk/app/autosave.c
   trunk/app/layer_dialog.c
   trunk/app/textedit.c
   trunk/lib/diagdkrenderer.c
   trunk/lib/diagramdata.c
   trunk/lib/message.c
   trunk/lib/persistence.c
   trunk/lib/persistence.h
   trunk/objects/AADL/edit_port_declaration.c
   trunk/plug-ins/wmf/wmf.cpp

Modified: trunk/app/autosave.c
==============================================================================
--- trunk/app/autosave.c	(original)
+++ trunk/app/autosave.c	Sun Feb  8 22:39:06 2009
@@ -71,7 +71,7 @@
     if (diagram_is_modified(diagram) && 
 	!diagram->autosaved) {
       /* Diagram has been modified.  At next idleness, save it */
-      g_idle_add (G_CALLBACK (autosave_save_diagram), diagram);
+      g_idle_add ((GSourceFunc)autosave_save_diagram, diagram);
     }
     diagrams = g_list_next(diagrams);
   }

Modified: trunk/app/layer_dialog.c
==============================================================================
--- trunk/app/layer_dialog.c	(original)
+++ trunk/app/layer_dialog.c	Sun Feb  8 22:39:06 2009
@@ -201,7 +201,7 @@
       image = gtk_image_new_from_stock (buttons[i].stock_name,
                                         GTK_ICON_SIZE_BUTTON);
 
-      gtk_button_set_image (GTK_BUTTON (button), GTK_IMAGE(image));
+      gtk_button_set_image (GTK_BUTTON (button), image);
     }
 
     g_signal_connect_swapped (GTK_OBJECT (button), "clicked",

Modified: trunk/app/textedit.c
==============================================================================
--- trunk/app/textedit.c	(original)
+++ trunk/app/textedit.c	Sun Feb  8 22:39:06 2009
@@ -371,9 +371,9 @@
   
   change = g_new0(TextEditChange, 1);
 
-  change->obj_change.apply = (ObjectChangeApplyFunc) text_edit_apply;
-  change->obj_change.revert = (ObjectChangeRevertFunc) text_edit_revert;
-  change->obj_change.free = (ObjectChangeFreeFunc) text_edit_free;
+  change->obj_change.apply = (UndoApplyFunc) text_edit_apply;
+  change->obj_change.revert = (UndoRevertFunc) text_edit_revert;
+  change->obj_change.free = (UndoFreeFunc) text_edit_free;
 
   change->text = text;
   if (text_is_empty(text)) {

Modified: trunk/lib/diagdkrenderer.c
==============================================================================
--- trunk/lib/diagdkrenderer.c	(original)
+++ trunk/lib/diagdkrenderer.c	Sun Feb  8 22:39:06 2009
@@ -818,7 +818,7 @@
 			 &real_x, &real_y);
 
     if (real_width == org_width && real_height == org_height) {
-      gdk_draw_pixbuf(renderer->pixmap, renderer->gc, org,
+      gdk_draw_pixbuf(renderer->pixmap, renderer->gc, (GdkPixbuf *)org,
 		      0, 0, real_x, real_y, real_width, real_height, 
 		      GDK_RGB_DITHER_NORMAL, 0, 0);
     } else if (real_width > org_width || real_height > org_height) {

Modified: trunk/lib/diagramdata.c
==============================================================================
--- trunk/lib/diagramdata.c	(original)
+++ trunk/lib/diagramdata.c	Sun Feb  8 22:39:06 2009
@@ -612,8 +612,7 @@
 	    gpointer gdata)
 {
   Layer *layer;
-  int i;
-  int active_layer;
+  guint i, active_layer;
 
   if (!renderer->is_interactive) 
     (DIA_RENDERER_GET_CLASS(renderer)->begin_render)(renderer);
@@ -633,7 +632,7 @@
 data_foreach_object (DiagramData *data, GFunc func, gpointer user_data)
 {
   Layer *layer;
-  int i;
+  guint i;
   for (i=0; i<data->layers->len; i++) {
     layer = (Layer *) g_ptr_array_index(data->layers, i);
     g_list_foreach (layer->objects, func, user_data);

Modified: trunk/lib/message.c
==============================================================================
--- trunk/lib/message.c	(original)
+++ trunk/lib/message.c	Sun Feb  8 22:39:06 2009
@@ -54,7 +54,8 @@
 }
 
 static void
-gtk_message_toggle_show_again(GtkWidget *button, gpointer *userdata) {
+gtk_message_toggle_show_again(GtkWidget *button, gpointer *userdata) 
+{
   DiaMessageInfo *msginfo = (DiaMessageInfo*)userdata;
   persistence_set_boolean(msginfo->title, 
 			  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));

Modified: trunk/lib/persistence.c
==============================================================================
--- trunk/lib/persistence.c	(original)
+++ trunk/lib/persistence.c	Sun Feb  8 22:39:06 2009
@@ -977,7 +977,7 @@
 /* ********* BOOLEANS ********** */
 /** Returns true if the given role has been registered. */
 gboolean
-persistence_boolean_is_registered(gchar *role)
+persistence_boolean_is_registered(const gchar *role)
 {
   gboolean *booleanval;
   if (role == NULL) return 0;
@@ -989,7 +989,7 @@
 }
 
 gboolean
-persistence_register_boolean(gchar *role, gboolean defaultvalue)
+persistence_register_boolean(const gchar *role, gboolean defaultvalue)
 {
   gboolean *booleanval;
   if (role == NULL) return 0;
@@ -1006,7 +1006,7 @@
 }
 
 gboolean
-persistence_get_boolean(gchar *role)
+persistence_get_boolean(const gchar *role)
 {
   gboolean *booleanval;
   if (persistent_booleans == NULL) {
@@ -1020,7 +1020,7 @@
 }
 
 void
-persistence_set_boolean(gchar *role, gboolean newvalue)
+persistence_set_boolean(const gchar *role, gboolean newvalue)
 {
   gboolean *booleanval;
   if (persistent_booleans == NULL) {

Modified: trunk/lib/persistence.h
==============================================================================
--- trunk/lib/persistence.h	(original)
+++ trunk/lib/persistence.h	Sun Feb  8 22:39:06 2009
@@ -80,10 +80,10 @@
 real persistence_get_real(gchar *role);
 void persistence_set_real(gchar *role, real newvalue);
 
-gboolean persistence_boolean_is_registered(gchar *role);
-gboolean persistence_register_boolean(gchar *role, gboolean defaultvalue);
-gboolean persistence_get_boolean(gchar *role);
-void persistence_set_boolean(gchar *role, gboolean newvalue);
+gboolean persistence_boolean_is_registered(const gchar *role);
+gboolean persistence_register_boolean(const gchar *role, gboolean defaultvalue);
+gboolean persistence_get_boolean(const gchar *role);
+void persistence_set_boolean(const gchar *role, gboolean newvalue);
 
 gchar *persistence_register_string(gchar *role, gchar *defaultvalue);
 gchar *persistence_get_string(gchar *role);

Modified: trunk/objects/AADL/edit_port_declaration.c
==============================================================================
--- trunk/objects/AADL/edit_port_declaration.c	(original)
+++ trunk/objects/AADL/edit_port_declaration.c	Sun Feb  8 22:39:06 2009
@@ -206,7 +206,7 @@
   change->newvalue = text;
   change->oldvalue = aadlbox->ports[port_num]->declaration;
 
-  change->obj_change.apply(change, obj);
+  change->obj_change.apply((ObjectChange *)change, obj);
     
   return (ObjectChange *) change;
 }

Modified: trunk/plug-ins/wmf/wmf.cpp
==============================================================================
--- trunk/plug-ins/wmf/wmf.cpp	(original)
+++ trunk/plug-ins/wmf/wmf.cpp	Sun Feb  8 22:39:06 2009
@@ -960,7 +960,7 @@
             gunichar2* swc = g_utf8_to_utf16 (text, -1, NULL, &wclen, NULL);
             W32::TextOutW (renderer->hFileDC,
                            SCX(pos->x), SCY(pos->y),
-                           swc, wclen);
+                           reinterpret_cast<W32::LPCWSTR>(swc), wclen);
             g_free (swc);
         }
     }