dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/brush_select.c app/channels_dialog.c app/disp_callbacks.c 

Sun Jan 10 21:42:11 GMT 1999  Austin Donnelly  <austin@greenend.org.uk>

	* app/brush_select.c
	* app/channels_dialog.c
	* app/disp_callbacks.c
	* app/histogram_tool.c
	* app/info_dialog.c
	* app/layer_select.c
	* app/pattern_select.c
	* plug-ins/gfig/gfig.c
	* plug-ins/newsprint/newsprint.c: More changes of the form
 	       s/gtk_label_set/gtk_label_set_text/
This commit is contained in:
GMT 1999 Austin Donnelly 1999-01-10 21:54:02 +00:00 committed by Austin Donnelly
parent 0b724ad309
commit 31fba3b3dc
22 changed files with 76 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
Sun Jan 10 21:42:11 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
* app/brush_select.c
* app/channels_dialog.c
* app/disp_callbacks.c
* app/histogram_tool.c
* app/info_dialog.c
* app/layer_select.c
* app/pattern_select.c
* plug-ins/gfig/gfig.c
* plug-ins/newsprint/newsprint.c: More changes of the form
s/gtk_label_set/gtk_label_set_text/
Sun Jan 10 20:44:07 GMT 1999 Adam D. Moss <adam@gimp.org>
* app/paint_funcs.c: Disabled debug output of [.!..!!] for COW

4
app/brush_select.c
View File

@ -886,11 +886,11 @@ update_active_brush_field (BrushSelectP bsp)
return;
/* Set brush name */
gtk_label_set (GTK_LABEL (bsp->brush_name), brush->name);
gtk_label_set_text (GTK_LABEL (bsp->brush_name), brush->name);
/* Set brush size */
sprintf (buf, "(%d X %d)", brush->mask->width, brush->mask->height);
gtk_label_set (GTK_LABEL (bsp->brush_size), buf);
gtk_label_set_text (GTK_LABEL (bsp->brush_size), buf);
/* Set brush spacing */
if(bsp == brush_select_dialog)

4
app/channels_dialog.c
View File

@ -1876,8 +1876,8 @@ edit_channel_query_ok_callback (GtkWidget *w,
/* Set the new channel name */
channel_set_name(channel,
gtk_entry_get_text (GTK_ENTRY (options->name_entry)));
gtk_label_set (GTK_LABEL (options->channel_widget->label),
channel_get_name(channel));
gtk_label_set_text (GTK_LABEL (options->channel_widget->label),
channel_get_name(channel));
if (channel->opacity != opacity)
{

2
app/dialogs/info-dialog.c
View File

@ -93,7 +93,7 @@ update_field (InfoField *field)
{
/* set the new value and update somehow */
if (field->callback == NULL)
gtk_label_set (GTK_LABEL (field->w), field->text_ptr);
gtk_label_set_text (GTK_LABEL (field->w), field->text_ptr);
else
gtk_entry_set_text (GTK_ENTRY (field->w), field->text_ptr);
}

2
app/disp_callbacks.c
View File

@ -167,7 +167,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
case GDK_LEAVE_NOTIFY:
gdisplay_update_cursor (gdisp, 0, 0);
gtk_label_set(GTK_LABEL (gdisp->cursor_label), "");
gtk_label_set_text (GTK_LABEL (gdisp->cursor_label), "");
case GDK_PROXIMITY_OUT:
gdisp->proximity = FALSE;
break;

2
app/display/gimpdisplay-callbacks.c
View File

@ -167,7 +167,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
case GDK_LEAVE_NOTIFY:
gdisplay_update_cursor (gdisp, 0, 0);
gtk_label_set(GTK_LABEL (gdisp->cursor_label), "");
gtk_label_set_text (GTK_LABEL (gdisp->cursor_label), "");
case GDK_PROXIMITY_OUT:
gdisp->proximity = FALSE;
break;

2
app/display/gimpdisplayshell-callbacks.c
View File

@ -167,7 +167,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
case GDK_LEAVE_NOTIFY:
gdisplay_update_cursor (gdisp, 0, 0);
gtk_label_set(GTK_LABEL (gdisp->cursor_label), "");
gtk_label_set_text (GTK_LABEL (gdisp->cursor_label), "");
case GDK_PROXIMITY_OUT:
gdisp->proximity = FALSE;
break;

2
app/display/gimpdisplayshell-layer-select.c
View File

@ -303,7 +303,7 @@ layer_select_set_layer (LayerSelect *layer_select)
return;
/* Set the layer label */
gtk_label_set (GTK_LABEL (layer_select->label), drawable_get_name (GIMP_DRAWABLE(layer)));
gtk_label_set_text (GTK_LABEL (layer_select->label), drawable_get_name (GIMP_DRAWABLE(layer)));
}

4
app/gui/brush-select.c
View File

@ -886,11 +886,11 @@ update_active_brush_field (BrushSelectP bsp)
return;
/* Set brush name */
gtk_label_set (GTK_LABEL (bsp->brush_name), brush->name);
gtk_label_set_text (GTK_LABEL (bsp->brush_name), brush->name);
/* Set brush size */
sprintf (buf, "(%d X %d)", brush->mask->width, brush->mask->height);
gtk_label_set (GTK_LABEL (bsp->brush_size), buf);
gtk_label_set_text (GTK_LABEL (bsp->brush_size), buf);
/* Set brush spacing */
if(bsp == brush_select_dialog)

4
app/gui/channels-dialog.c
View File

@ -1876,8 +1876,8 @@ edit_channel_query_ok_callback (GtkWidget *w,
/* Set the new channel name */
channel_set_name(channel,
gtk_entry_get_text (GTK_ENTRY (options->name_entry)));
gtk_label_set (GTK_LABEL (options->channel_widget->label),
channel_get_name(channel));
gtk_label_set_text (GTK_LABEL (options->channel_widget->label),
channel_get_name(channel));
if (channel->opacity != opacity)
{

2
app/gui/info-dialog.c
View File

@ -93,7 +93,7 @@ update_field (InfoField *field)
{
/* set the new value and update somehow */
if (field->callback == NULL)
gtk_label_set (GTK_LABEL (field->w), field->text_ptr);
gtk_label_set_text (GTK_LABEL (field->w), field->text_ptr);
else
gtk_entry_set_text (GTK_ENTRY (field->w), field->text_ptr);
}

2
app/gui/layer-select.c
View File

@ -303,7 +303,7 @@ layer_select_set_layer (LayerSelect *layer_select)
return;
/* Set the layer label */
gtk_label_set (GTK_LABEL (layer_select->label), drawable_get_name (GIMP_DRAWABLE(layer)));
gtk_label_set_text (GTK_LABEL (layer_select->label), drawable_get_name (GIMP_DRAWABLE(layer)));
}

4
app/gui/pattern-select.c
View File

@ -620,11 +620,11 @@ update_active_pattern_field (PatternSelectP psp)
return;
/* Set pattern name */
gtk_label_set (GTK_LABEL (psp->pattern_name), pattern->name);
gtk_label_set_text (GTK_LABEL (psp->pattern_name), pattern->name);
/* Set pattern size */
sprintf (buf, "(%d X %d)", pattern->mask->width, pattern->mask->height);
gtk_label_set (GTK_LABEL (psp->pattern_size), buf);
gtk_label_set_text (GTK_LABEL (psp->pattern_size), buf);
}
static gint

14
app/histogram_tool.c
View File

@ -251,34 +251,34 @@ histogram_tool_dialog_update (HistogramToolDialog *htd,
/* mean */
sprintf (text, "%3.1f", htd->mean);
gtk_label_set (GTK_LABEL (htd->info_labels[0]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[0]), text);
/* std dev */
sprintf (text, "%3.1f", htd->std_dev);
gtk_label_set (GTK_LABEL (htd->info_labels[1]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[1]), text);
/* median */
sprintf (text, "%3.1f", htd->median);
gtk_label_set (GTK_LABEL (htd->info_labels[2]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[2]), text);
/* pixels */
sprintf (text, "%8.1f", htd->pixels);
gtk_label_set (GTK_LABEL (htd->info_labels[3]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[3]), text);
/* intensity */
if (start == end)
sprintf (text, "%d", start);
else
sprintf (text, "%d..%d", start, end);
gtk_label_set (GTK_LABEL (htd->info_labels[4]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[4]), text);
/* count */
sprintf (text, "%8.1f", htd->count);
gtk_label_set (GTK_LABEL (htd->info_labels[5]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[5]), text);
/* percentile */
sprintf (text, "%2.2f", htd->percentile * 100);
gtk_label_set (GTK_LABEL (htd->info_labels[6]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[6]), text);
}
/* histogram_tool action functions */

2
app/info_dialog.c
View File

@ -93,7 +93,7 @@ update_field (InfoField *field)
{
/* set the new value and update somehow */
if (field->callback == NULL)
gtk_label_set (GTK_LABEL (field->w), field->text_ptr);
gtk_label_set_text (GTK_LABEL (field->w), field->text_ptr);
else
gtk_entry_set_text (GTK_ENTRY (field->w), field->text_ptr);
}

2
app/layer_select.c
View File

@ -303,7 +303,7 @@ layer_select_set_layer (LayerSelect *layer_select)
return;
/* Set the layer label */
gtk_label_set (GTK_LABEL (layer_select->label), drawable_get_name (GIMP_DRAWABLE(layer)));
gtk_label_set_text (GTK_LABEL (layer_select->label), drawable_get_name (GIMP_DRAWABLE(layer)));
}

4
app/pattern_select.c
View File

@ -620,11 +620,11 @@ update_active_pattern_field (PatternSelectP psp)
return;
/* Set pattern name */
gtk_label_set (GTK_LABEL (psp->pattern_name), pattern->name);
gtk_label_set_text (GTK_LABEL (psp->pattern_name), pattern->name);
/* Set pattern size */
sprintf (buf, "(%d X %d)", pattern->mask->width, pattern->mask->height);
gtk_label_set (GTK_LABEL (psp->pattern_size), buf);
gtk_label_set_text (GTK_LABEL (psp->pattern_size), buf);
}
static gint

14
app/tools/gimphistogramtool.c
View File

@ -251,34 +251,34 @@ histogram_tool_dialog_update (HistogramToolDialog *htd,
/* mean */
sprintf (text, "%3.1f", htd->mean);
gtk_label_set (GTK_LABEL (htd->info_labels[0]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[0]), text);
/* std dev */
sprintf (text, "%3.1f", htd->std_dev);
gtk_label_set (GTK_LABEL (htd->info_labels[1]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[1]), text);
/* median */
sprintf (text, "%3.1f", htd->median);
gtk_label_set (GTK_LABEL (htd->info_labels[2]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[2]), text);
/* pixels */
sprintf (text, "%8.1f", htd->pixels);
gtk_label_set (GTK_LABEL (htd->info_labels[3]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[3]), text);
/* intensity */
if (start == end)
sprintf (text, "%d", start);
else
sprintf (text, "%d..%d", start, end);
gtk_label_set (GTK_LABEL (htd->info_labels[4]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[4]), text);
/* count */
sprintf (text, "%8.1f", htd->count);
gtk_label_set (GTK_LABEL (htd->info_labels[5]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[5]), text);
/* percentile */
sprintf (text, "%2.2f", htd->percentile * 100);
gtk_label_set (GTK_LABEL (htd->info_labels[6]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[6]), text);
}
/* histogram_tool action functions */

14
app/tools/histogram_tool.c
View File

@ -251,34 +251,34 @@ histogram_tool_dialog_update (HistogramToolDialog *htd,
/* mean */
sprintf (text, "%3.1f", htd->mean);
gtk_label_set (GTK_LABEL (htd->info_labels[0]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[0]), text);
/* std dev */
sprintf (text, "%3.1f", htd->std_dev);
gtk_label_set (GTK_LABEL (htd->info_labels[1]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[1]), text);
/* median */
sprintf (text, "%3.1f", htd->median);
gtk_label_set (GTK_LABEL (htd->info_labels[2]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[2]), text);
/* pixels */
sprintf (text, "%8.1f", htd->pixels);
gtk_label_set (GTK_LABEL (htd->info_labels[3]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[3]), text);
/* intensity */
if (start == end)
sprintf (text, "%d", start);
else
sprintf (text, "%d..%d", start, end);
gtk_label_set (GTK_LABEL (htd->info_labels[4]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[4]), text);
/* count */
sprintf (text, "%8.1f", htd->count);
gtk_label_set (GTK_LABEL (htd->info_labels[5]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[5]), text);
/* percentile */
sprintf (text, "%2.2f", htd->percentile * 100);
gtk_label_set (GTK_LABEL (htd->info_labels[6]), text);
gtk_label_set_text (GTK_LABEL (htd->info_labels[6]), text);
}
/* histogram_tool action functions */

9
plug-ins/common/newsprint.c
View File

@ -23,7 +23,7 @@
*/
/*
* version 0.51
* version 0.52
* This version requires gtk-1.0.4 or above.
*
* This plug-in puts an image through a screen at a particular angle
@ -38,6 +38,9 @@
* Tim Harris <tim.harris@acm.org> provided valuable feedback on
* pre-press issues.
*
*
* 0.52: 10 Jan 1999 <austin@greenend.org.uk>
* gtk_label_set() -> gtk_label_set_text()
*/
@ -52,7 +55,7 @@
static char rcsid[] = "$Id$";
#endif
#define VERSION "v0.51"
#define VERSION "v0.52"
/* Some useful macros */
#ifdef DEBUG
@ -808,7 +811,7 @@ preview_update(channel_st *st)
gtk_widget_draw(prev->widget, NULL);
sprintf(pct, "%2d%%", (int)rint(spotfn_list[sfn].prev_lvl[i] * 100));
gtk_label_set(GTK_LABEL(prev->label), pct);
gtk_label_set_text (GTK_LABEL(prev->label), pct);
}
gdk_flush ();

18
plug-ins/gfig/gfig.c
View File

@ -4429,14 +4429,14 @@ gfig_pos_update_labels(gpointer data)
else
sprintf(buf," X: %.3d ",x_pos_val);
gtk_label_set(GTK_LABEL(x_pos_label),buf);
gtk_label_set_text(GTK_LABEL(x_pos_label),buf);
if(y_pos_val < 0)
sprintf(buf," Y:%.3d ",y_pos_val);
else
sprintf(buf," Y: %.3d ",y_pos_val);
gtk_label_set(GTK_LABEL(y_pos_label),buf);
gtk_label_set_text(GTK_LABEL(y_pos_label),buf);
}
static void
@ -4466,7 +4466,7 @@ gfig_obj_size_update(gint sz)
static gchar buf[256];
sprintf(buf,"%6d",sz);
gtk_label_set(GTK_LABEL(obj_size_label),buf);
gtk_label_set_text(GTK_LABEL(obj_size_label),buf);
}
static GtkWidget *
@ -4491,7 +4491,7 @@ gfig_obj_size_label(void)
gtk_widget_show(hbox);
sprintf(buf,"%6d",0);
gtk_label_set(GTK_LABEL(obj_size_label),buf);
gtk_label_set_text(GTK_LABEL(obj_size_label),buf);
return(hbox);
}
@ -4529,9 +4529,9 @@ gfig_pos_labels(void)
gtk_widget_show(vbox);
sprintf(buf," X: %.3d ",0);
gtk_label_set(GTK_LABEL(x_pos_label),buf);
gtk_label_set_text(GTK_LABEL(x_pos_label),buf);
sprintf(buf," Y: %.3d ",0);
gtk_label_set(GTK_LABEL(y_pos_label),buf);
gtk_label_set_text(GTK_LABEL(y_pos_label),buf);
return(hbox);
}
@ -5314,7 +5314,7 @@ gfig_list_ok_callback (GtkWidget *w,
#endif /* DEBUG */
/* Need to reorder the list */
/* gtk_label_set (GTK_LABEL (options->layer_widget->label), layer->name);*/
/* gtk_label_set_text (GTK_LABEL (options->layer_widget->label), layer->name);*/
pos = gtk_list_child_position(GTK_LIST(gfig_gtk_list),list);
#ifdef DEBUG
@ -6224,7 +6224,7 @@ gfig_update_stat_labels()
else
sprintf(str,"<NONE>");
gtk_label_set(GTK_LABEL(status_label_dname),str);
gtk_label_set_text(GTK_LABEL(status_label_dname),str);
if(current_obj->filename)
{
@ -6252,7 +6252,7 @@ gfig_update_stat_labels()
else
sprintf(str,"<NONE>");
gtk_label_set(GTK_LABEL(status_label_fname),str);
gtk_label_set_text(GTK_LABEL(status_label_fname),str);
}

9
plug-ins/newsprint/newsprint.c
View File

@ -23,7 +23,7 @@
*/
/*
* version 0.51
* version 0.52
* This version requires gtk-1.0.4 or above.
*
* This plug-in puts an image through a screen at a particular angle
@ -38,6 +38,9 @@
* Tim Harris <tim.harris@acm.org> provided valuable feedback on
* pre-press issues.
*
*
* 0.52: 10 Jan 1999 <austin@greenend.org.uk>
* gtk_label_set() -> gtk_label_set_text()
*/
@ -52,7 +55,7 @@
static char rcsid[] = "$Id$";
#endif
#define VERSION "v0.51"
#define VERSION "v0.52"
/* Some useful macros */
#ifdef DEBUG
@ -808,7 +811,7 @@ preview_update(channel_st *st)
gtk_widget_draw(prev->widget, NULL);
sprintf(pct, "%2d%%", (int)rint(spotfn_list[sfn].prev_lvl[i] * 100));
gtk_label_set(GTK_LABEL(prev->label), pct);
gtk_label_set_text (GTK_LABEL(prev->label), pct);
}
gdk_flush ();