[beast: 13/24] GXK: use Rapicorn's printout()



commit 477446981df8c6be4b0ce2cd5f225421ec6774d3
Author: Tim Janik <timj gnu org>
Date:   Wed Sep 23 09:52:38 2015 +0200

    GXK: use Rapicorn's printout()

 beast-gtk/gxk/glewidgets.c       |   20 ++++++++++----------
 beast-gtk/gxk/gxkrackitem.cc     |    2 +-
 beast-gtk/gxk/gxkradget.cc       |    6 +++---
 beast-gtk/gxk/gxkscrollcanvas.cc |    2 +-
 beast-gtk/gxk/gxksimplelabel.cc  |    2 +-
 beast-gtk/gxk/splinetest.cc      |    6 +++---
 6 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/beast-gtk/gxk/glewidgets.c b/beast-gtk/gxk/glewidgets.c
index f3702b2..1c9321b 100644
--- a/beast-gtk/gxk/glewidgets.c
+++ b/beast-gtk/gxk/glewidgets.c
@@ -1077,7 +1077,7 @@ gtk_hwrap_box_size_request (GtkWidget      *widget,
          requisition->height = layout_height;
        }
 
-      /* g_print ("ratio for width %d height %d = %f\n",
+      /* printout ("ratio for width %d height %d = %f\n",
         (gint) layout_width,
         (gint) layout_height,
         ratio);
@@ -1087,7 +1087,7 @@ gtk_hwrap_box_size_request (GtkWidget      *widget,
 
   requisition->width += GTK_CONTAINER (wbox)->border_width * 2; /*<h2v-skip>*/
   requisition->height += GTK_CONTAINER (wbox)->border_width * 2; /*<h2v-skip>*/
-  /* g_print ("choosen: width %d, height %d\n",
+  /* printout ("choosen: width %d, height %d\n",
      requisition->width,
      requisition->height);
   */
@@ -1275,10 +1275,10 @@ layout_row (GtkWrapBox    *wbox,
            }
          else
            {
-             /* g_print ("child_allocation.x %d += %d * %f ",
+             /* printout ("child_allocation.x %d += %d * %f ",
                       child_allocation.x, n_children, extra); */
              child_allocation.x += n_children * extra;
-             /* g_print ("= %d\n",
+             /* printout ("= %d\n",
                       child_allocation.x); */
              child_allocation.width = MIN (child_requisition.width,
                                            area->width - child_allocation.x + area->x);
@@ -1452,7 +1452,7 @@ gtk_hwrap_box_size_allocate (GtkWidget     *widget,
   area.height = MAX (1, (gint) allocation->height - border * 2);
 
   /*<h2v-off>*/
-  /* g_print ("got: width %d, height %d\n",
+  /* printout ("got: width %d, height %d\n",
      allocation->width,
      allocation->height);
   */
@@ -1732,7 +1732,7 @@ gtk_vwrap_box_size_request (GtkWidget      *widget,
          requisition->width = layout_width;
        }
 
-      /* g_print ("ratio for height %d width %d = %f\n",
+      /* printout ("ratio for height %d width %d = %f\n",
         (gint) layout_height,
         (gint) layout_width,
         ratio);
@@ -1742,7 +1742,7 @@ gtk_vwrap_box_size_request (GtkWidget      *widget,
 
   requisition->width += GTK_CONTAINER (wbox)->border_width * 2; /*<h2v-skip>*/
   requisition->height += GTK_CONTAINER (wbox)->border_width * 2; /*<h2v-skip>*/
-  /* g_print ("choosen: height %d, width %d\n",
+  /* printout ("choosen: height %d, width %d\n",
      requisition->height,
      requisition->width);
   */
@@ -1930,10 +1930,10 @@ layout_col (GtkWrapBox    *wbox,
            }
          else
            {
-             /* g_print ("child_allocation.y %d += %d * %f ",
+             /* printout ("child_allocation.y %d += %d * %f ",
                       child_allocation.y, n_children, extra); */
              child_allocation.y += n_children * extra;
-             /* g_print ("= %d\n",
+             /* printout ("= %d\n",
                       child_allocation.y); */
              child_allocation.height = MIN (child_requisition.height,
                                            area->height - child_allocation.y + area->y);
@@ -2107,7 +2107,7 @@ gtk_vwrap_box_size_allocate (GtkWidget     *widget,
   area.width = MAX (1, (gint) allocation->width - border * 2);
 
   /*<h2v-off>*/
-  /* g_print ("got: width %d, height %d\n",
+  /* printout ("got: width %d, height %d\n",
      allocation->width,
      allocation->height);
   */
diff --git a/beast-gtk/gxk/gxkrackitem.cc b/beast-gtk/gxk/gxkrackitem.cc
index 928944a..fd8ff86 100644
--- a/beast-gtk/gxk/gxkrackitem.cc
+++ b/beast-gtk/gxk/gxkrackitem.cc
@@ -240,7 +240,7 @@ gxk_rack_item_button_press (GxkRackItem    *self,
   if (event->button == 3)
     {
     }
-  g_print ("rack-item, button-%u pressed\n", event->button);
+  printout ("rack-item, button-%u pressed\n", event->button);
 }
 
 void
diff --git a/beast-gtk/gxk/gxkradget.cc b/beast-gtk/gxk/gxkradget.cc
index 3265a48..785994a 100644
--- a/beast-gtk/gxk/gxkradget.cc
+++ b/beast-gtk/gxk/gxkradget.cc
@@ -1120,7 +1120,7 @@ property_value_from_string (GtkType      widget_type,
       break;
     }
   if (0 && G_VALUE_TYPE (value) && strchr (pvalue, '$'))
-    g_print ("property[%s]: expr=%s result=%s GValue=%s\n", pspec->name, pvalue, exvalue, 
g_strdup_value_contents (value));
+    printout ("property[%s]: expr=%s result=%s GValue=%s\n", pspec->name, pvalue, exvalue, 
g_strdup_value_contents (value));
   g_free (exvalue);
 }
 
@@ -2398,10 +2398,10 @@ mf_println (GSList *args,
   while (argiter)
     {
       gchar *arg = argiter_exp (&argiter, env);
-      g_print ("%s", arg ? arg : "(null)");
+      printout ("%s", arg ? arg : "(null)");
       g_free (arg);
     }
-  g_print ("\n");
+  printout ("\n");
   return NULL;
 }
 
diff --git a/beast-gtk/gxk/gxkscrollcanvas.cc b/beast-gtk/gxk/gxkscrollcanvas.cc
index de51119..559d3f5 100644
--- a/beast-gtk/gxk/gxkscrollcanvas.cc
+++ b/beast-gtk/gxk/gxkscrollcanvas.cc
@@ -904,7 +904,7 @@ scroll_canvas_expose (GtkWidget      *widget,
         }
       else if (event->window == self->canvas)
         {
-          // g_print ("%s: canvas-expose: %d %d %d %d\n", G_OBJECT_TYPE_NAME (self), area.x, area.y, 
area.width, area.height);
+          // printout ("%s: canvas-expose: %d %d %d %d\n", G_OBJECT_TYPE_NAME (self), area.x, area.y, 
area.width, area.height);
           if (klass->double_buffer_canvas)
             gdk_window_begin_paint_rect (event->window, &area);
           else if (klass->auto_clear)
diff --git a/beast-gtk/gxk/gxksimplelabel.cc b/beast-gtk/gxk/gxksimplelabel.cc
index 4bd365f..c0771c8 100644
--- a/beast-gtk/gxk/gxksimplelabel.cc
+++ b/beast-gtk/gxk/gxksimplelabel.cc
@@ -291,7 +291,7 @@ simple_label_mnemonic_activate (GtkWidget *widget,
           GTK_IS_MENU_ITEM (parent))
         {
           gboolean cc = gtk_widget_mnemonic_activate (parent, group_cycling);
-          g_print ("simple_label_mnemonic_activate: %s: %u (%d %d %d %d)\n", G_OBJECT_TYPE_NAME (parent), cc,
+          printout ("simple_label_mnemonic_activate: %s: %u (%d %d %d %d)\n", G_OBJECT_TYPE_NAME (parent), 
cc,
                    GTK_WIDGET_CAN_FOCUS (parent), GTK_WIDGET_GET_CLASS (parent)->activate_signal,
                    (parent->parent && GTK_IS_NOTEBOOK (parent->parent)),
                    GTK_IS_MENU_ITEM (parent));
diff --git a/beast-gtk/gxk/splinetest.cc b/beast-gtk/gxk/splinetest.cc
index aedc14e..36f1a2a 100644
--- a/beast-gtk/gxk/splinetest.cc
+++ b/beast-gtk/gxk/splinetest.cc
@@ -16,14 +16,14 @@ spline_test (GxkSpline *spline,
         double x = spline->segs[i - 1].x + k * (spline->segs[i].x - spline->segs[i - 1].x) / interval_steps;
         double y1 = gxk_spline_y (spline, x);
         if (!swap)
-          g_print ("%-+24.18g %-+24.18g\n", x, y1);
+          printout ("%-+24.18g %-+24.18g\n", x, y1);
         else if (1)
-          g_print ("%-+24.18g %-+24.18g\n", y1, x);
+          printout ("%-+24.18g %-+24.18g\n", y1, x);
         else
           {
             double z = gxk_spline_findx (spline, y1);
             double y2 = gxk_spline_y (spline, z);
-            g_print ("%-+24.18g %-+24.18g # findx=%-+24.18g dx=%-+24.18f (%u) dy=%-+24.18g (%u)\n", x, y1, 
z, x-z, x==z, y1 - y2, y1==y2);
+            printout ("%-+24.18g %-+24.18g # findx=%-+24.18g dx=%-+24.18f (%u) dy=%-+24.18g (%u)\n", x, y1, 
z, x-z, x==z, y1 - y2, y1==y2);
           }
       }
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]