comparison src/audacious/ui_skinned_textbox.c @ 4119:9d4b5cdae3ba

oops, fix previous commit
author Tomasz Mon <desowin@gmail.com>
date Tue, 25 Dec 2007 16:42:10 +0100
parents 1112f53ecc18
children 07c1639b110b
comparison
equal deleted inserted replaced
4118:1112f53ecc18 4119:9d4b5cdae3ba
274 g_return_val_if_fail (UI_SKINNED_IS_TEXTBOX (widget), FALSE); 274 g_return_val_if_fail (UI_SKINNED_IS_TEXTBOX (widget), FALSE);
275 g_return_val_if_fail (event != NULL, FALSE); 275 g_return_val_if_fail (event != NULL, FALSE);
276 276
277 UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget); 277 UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget);
278 UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox); 278 UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
279 g_return_val_if_fail (textbox->width > 0 || textbox->height > 0, FALSE); 279 g_return_val_if_fail (textbox->width > 0 && textbox->height > 0, FALSE);
280 280
281 GdkPixmap *obj = NULL; 281 GdkPixmap *obj = NULL;
282 GdkGC *gc; 282 GdkGC *gc;
283 gint cw; 283 gint cw;
284 284
526 PangoLayout *layout; 526 PangoLayout *layout;
527 gint width; 527 gint width;
528 528
529 g_return_if_fail(textbox != NULL); 529 g_return_if_fail(textbox != NULL);
530 g_return_if_fail(pixmaptext != NULL); 530 g_return_if_fail(pixmaptext != NULL);
531 g_return_val_if_fail (textbox->height > 0, FALSE); 531 g_return_if_fail(textbox->height > 0);
532 532
533 UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox); 533 UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
534 534
535 length = g_utf8_strlen(pixmaptext, -1); 535 length = g_utf8_strlen(pixmaptext, -1);
536 536