Mercurial > dwindows
comparison gtk3/dw.c @ 1894:ed377fd16360
Fix some warnings reported by clang on FreeBSD in the GTK modules.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 18 Oct 2013 10:59:37 +0000 |
parents | c4a6ef8291be |
children | 969f7bbc0ff5 |
comparison
equal
deleted
inserted
replaced
1893:c6b47f3db988 | 1894:ed377fd16360 |
---|---|
376 GtkWidget *mdi; | 376 GtkWidget *mdi; |
377 GdkRGBA background; | 377 GdkRGBA background; |
378 | 378 |
379 mdi = GTK_WIDGET (g_object_new (gtk_mdi_get_type (), NULL)); | 379 mdi = GTK_WIDGET (g_object_new (gtk_mdi_get_type (), NULL)); |
380 gdk_rgba_parse (&background, GTK_MDI_BACKGROUND); | 380 gdk_rgba_parse (&background, GTK_MDI_BACKGROUND); |
381 gtk_widget_override_background_color (mdi, GTK_STATE_NORMAL, &background); | 381 gtk_widget_override_background_color (mdi, GTK_STATE_FLAG_NORMAL, &background); |
382 | 382 |
383 return mdi; | 383 return mdi; |
384 } | 384 } |
385 | 385 |
386 static void gtk_mdi_put(GtkMdi *mdi, GtkWidget *child_widget, gint x, gint y, GtkWidget *label) | 386 static void gtk_mdi_put(GtkMdi *mdi, GtkWidget *child_widget, gint x, gint y, GtkWidget *label) |
416 gtk_widget_set_events (button[i], GDK_BUTTON_PRESS_MASK); | 416 gtk_widget_set_events (button[i], GDK_BUTTON_PRESS_MASK); |
417 } | 417 } |
418 | 418 |
419 gdk_rgba_parse (&color, GTK_MDI_LABEL_BACKGROUND); | 419 gdk_rgba_parse (&color, GTK_MDI_LABEL_BACKGROUND); |
420 | 420 |
421 gtk_widget_override_background_color (top_event_box, GTK_STATE_NORMAL, &color); | 421 gtk_widget_override_background_color (top_event_box, GTK_STATE_FLAG_NORMAL, &color); |
422 gtk_widget_override_background_color (bottom_event_box, GTK_STATE_NORMAL, &color); | 422 gtk_widget_override_background_color (bottom_event_box, GTK_STATE_FLAG_NORMAL, &color); |
423 gtk_widget_override_background_color (child_box, GTK_STATE_NORMAL, &color); | 423 gtk_widget_override_background_color (child_box, GTK_STATE_FLAG_NORMAL, &color); |
424 for (i = GTK_STATE_NORMAL; i < GTK_STATE_ACTIVE; i++) | 424 for (j = 0; j < 3; j++) |
425 { | 425 { |
426 for (j = 0; j < 3; j++) | 426 gtk_widget_override_background_color (button[j], GTK_STATE_FLAG_NORMAL, &color); |
427 { | 427 gtk_widget_override_background_color (button[j], GTK_STATE_FLAG_ACTIVE, &color); |
428 gtk_widget_override_background_color (button[j], i, &color); | |
429 } | |
430 } | 428 } |
431 gdk_rgba_parse (&color, GTK_MDI_LABEL_FOREGROUND); | 429 gdk_rgba_parse (&color, GTK_MDI_LABEL_FOREGROUND); |
432 gtk_widget_override_color (label, GTK_STATE_NORMAL, &color); | 430 gtk_widget_override_color (label, GTK_STATE_FLAG_NORMAL, &color); |
433 gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); | 431 gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); |
434 | 432 |
435 gtk_container_add (GTK_CONTAINER (top_event_box), label); | 433 gtk_container_add (GTK_CONTAINER (top_event_box), label); |
436 gtk_container_add (GTK_CONTAINER (child_widget_box), child_widget); | 434 gtk_container_add (GTK_CONTAINER (child_widget_box), child_widget); |
437 gtk_widget_set_size_request (bottom_event_box, 2, 2); | 435 gtk_widget_set_size_request (bottom_event_box, 2, 2); |
2805 forecolor.blue = (gdouble)DW_BLUE_VALUE(fore) / 255.0; | 2803 forecolor.blue = (gdouble)DW_BLUE_VALUE(fore) / 255.0; |
2806 } | 2804 } |
2807 else if(fore != DW_CLR_DEFAULT) | 2805 else if(fore != DW_CLR_DEFAULT) |
2808 forecolor = _colors[fore]; | 2806 forecolor = _colors[fore]; |
2809 | 2807 |
2810 gtk_widget_override_color(handle, GTK_STATE_NORMAL, fore != DW_CLR_DEFAULT ? &forecolor : NULL); | 2808 gtk_widget_override_color(handle, GTK_STATE_FLAG_NORMAL, fore != DW_CLR_DEFAULT ? &forecolor : NULL); |
2811 gtk_widget_override_color(handle, GTK_STATE_ACTIVE, fore != DW_CLR_DEFAULT ? &forecolor : NULL); | 2809 gtk_widget_override_color(handle, GTK_STATE_FLAG_ACTIVE, fore != DW_CLR_DEFAULT ? &forecolor : NULL); |
2812 | 2810 |
2813 if(back & DW_RGB_COLOR) | 2811 if(back & DW_RGB_COLOR) |
2814 { | 2812 { |
2815 backcolor.alpha = 1.0; | 2813 backcolor.alpha = 1.0; |
2816 backcolor.red = (gdouble)DW_RED_VALUE(back) / 255.0; | 2814 backcolor.red = (gdouble)DW_RED_VALUE(back) / 255.0; |
2818 backcolor.blue = (gdouble)DW_BLUE_VALUE(back) / 255.0; | 2816 backcolor.blue = (gdouble)DW_BLUE_VALUE(back) / 255.0; |
2819 } | 2817 } |
2820 else if(back != DW_CLR_DEFAULT) | 2818 else if(back != DW_CLR_DEFAULT) |
2821 backcolor = _colors[back]; | 2819 backcolor = _colors[back]; |
2822 | 2820 |
2823 gtk_widget_override_background_color(handle, GTK_STATE_NORMAL, back != DW_CLR_DEFAULT ? &backcolor : NULL); | 2821 gtk_widget_override_background_color(handle, GTK_STATE_FLAG_NORMAL, back != DW_CLR_DEFAULT ? &backcolor : NULL); |
2824 gtk_widget_override_background_color(handle, GTK_STATE_ACTIVE, back != DW_CLR_DEFAULT ? &backcolor : NULL); | 2822 gtk_widget_override_background_color(handle, GTK_STATE_FLAG_ACTIVE, back != DW_CLR_DEFAULT ? &backcolor : NULL); |
2825 | 2823 |
2826 _save_gdk_colors(handle, forecolor, backcolor); | 2824 _save_gdk_colors(handle, forecolor, backcolor); |
2827 | 2825 |
2828 return TRUE; | 2826 return TRUE; |
2829 } | 2827 } |
7569 * Note: This does nothing on GTK+ as transparency | 7567 * Note: This does nothing on GTK+ as transparency |
7570 * is handled automatically | 7568 * is handled automatically |
7571 */ | 7569 */ |
7572 void dw_pixmap_set_transparent_color(HPIXMAP pixmap, unsigned long color) | 7570 void dw_pixmap_set_transparent_color(HPIXMAP pixmap, unsigned long color) |
7573 { | 7571 { |
7574 pixmap = pixmap; | |
7575 color = color; | |
7576 } | 7572 } |
7577 | 7573 |
7578 /* | 7574 /* |
7579 * Creates a pixmap from internal resource graphic specified by id. | 7575 * Creates a pixmap from internal resource graphic specified by id. |
7580 * Parameters: | 7576 * Parameters: |
8538 tmp[1] = data; | 8534 tmp[1] = data; |
8539 | 8535 |
8540 rc = pthread_create(>kthread, NULL, (void *)_dwthreadstart, (void *)tmp); | 8536 rc = pthread_create(>kthread, NULL, (void *)_dwthreadstart, (void *)tmp); |
8541 if ( rc == 0 ) | 8537 if ( rc == 0 ) |
8542 return gtkthread; | 8538 return gtkthread; |
8543 else | 8539 return (DWTID)DW_ERROR_UNKNOWN; |
8544 return rc; | |
8545 } | 8540 } |
8546 | 8541 |
8547 /* | 8542 /* |
8548 * Ends execution of current thread immediately. | 8543 * Ends execution of current thread immediately. |
8549 */ | 8544 */ |