Mercurial > dwindows

changeset 1894:ed377fd16360

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 c6b47f3db988
children fafe1a68f0fd
files gtk/dw.c gtk3/dw.c
diffstat 2 files changed, 14 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/dw.c	Thu Oct 17 23:02:45 2013 +0000
+++ b/gtk/dw.c	Fri Oct 18 10:59:37 2013 +0000
@@ -9171,12 +9171,6 @@
  */
 void dw_pixmap_set_transparent_color(HPIXMAP pixmap, unsigned long color)
 {
-   int _locked_by_me = FALSE;
-
-   DW_MUTEX_LOCK;
-   pixmap = pixmap;
-   color = color;
-   DW_MUTEX_UNLOCK;
 }
 
 /*
@@ -11109,8 +11103,6 @@
          }
          else
          {
-            int cx , cy;
-
             /* Check if we have cached frame size values */
             if(!(cx | cy))
             {
--- a/gtk3/dw.c	Thu Oct 17 23:02:45 2013 +0000
+++ b/gtk3/dw.c	Fri Oct 18 10:59:37 2013 +0000
@@ -378,7 +378,7 @@
 
    mdi = GTK_WIDGET (g_object_new (gtk_mdi_get_type (), NULL));
    gdk_rgba_parse (&background, GTK_MDI_BACKGROUND);
-   gtk_widget_override_background_color (mdi, GTK_STATE_NORMAL, &background);
+   gtk_widget_override_background_color (mdi, GTK_STATE_FLAG_NORMAL, &background);
 
    return mdi;
 }
@@ -418,18 +418,16 @@
 
    gdk_rgba_parse (&color, GTK_MDI_LABEL_BACKGROUND);
 
-   gtk_widget_override_background_color (top_event_box, GTK_STATE_NORMAL, &color);
-   gtk_widget_override_background_color (bottom_event_box, GTK_STATE_NORMAL, &color);
-   gtk_widget_override_background_color (child_box, GTK_STATE_NORMAL, &color);
-   for (i = GTK_STATE_NORMAL; i < GTK_STATE_ACTIVE; i++)
-   {
-      for (j = 0; j < 3; j++)
-      {
-         gtk_widget_override_background_color (button[j], i, &color);
-      }
+   gtk_widget_override_background_color (top_event_box, GTK_STATE_FLAG_NORMAL, &color);
+   gtk_widget_override_background_color (bottom_event_box, GTK_STATE_FLAG_NORMAL, &color);
+   gtk_widget_override_background_color (child_box, GTK_STATE_FLAG_NORMAL, &color);
+   for (j = 0; j < 3; j++)
+   {
+      gtk_widget_override_background_color (button[j], GTK_STATE_FLAG_NORMAL, &color);
+      gtk_widget_override_background_color (button[j], GTK_STATE_FLAG_ACTIVE, &color);
    }
    gdk_rgba_parse (&color, GTK_MDI_LABEL_FOREGROUND);
-   gtk_widget_override_color (label, GTK_STATE_NORMAL, &color);
+   gtk_widget_override_color (label, GTK_STATE_FLAG_NORMAL, &color);
    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 
    gtk_container_add (GTK_CONTAINER (top_event_box), label);
@@ -2807,8 +2805,8 @@
    else if(fore != DW_CLR_DEFAULT)
       forecolor = _colors[fore];
       
-   gtk_widget_override_color(handle, GTK_STATE_NORMAL, fore != DW_CLR_DEFAULT ? &forecolor : NULL);
-   gtk_widget_override_color(handle, GTK_STATE_ACTIVE, fore != DW_CLR_DEFAULT ? &forecolor : NULL);
+   gtk_widget_override_color(handle, GTK_STATE_FLAG_NORMAL, fore != DW_CLR_DEFAULT ? &forecolor : NULL);
+   gtk_widget_override_color(handle, GTK_STATE_FLAG_ACTIVE, fore != DW_CLR_DEFAULT ? &forecolor : NULL);
    
    if(back & DW_RGB_COLOR)
    {
@@ -2820,8 +2818,8 @@
    else if(back != DW_CLR_DEFAULT)
       backcolor = _colors[back];
       
-   gtk_widget_override_background_color(handle, GTK_STATE_NORMAL, back != DW_CLR_DEFAULT ? &backcolor : NULL);
-   gtk_widget_override_background_color(handle, GTK_STATE_ACTIVE, back != DW_CLR_DEFAULT ? &backcolor : NULL);
+   gtk_widget_override_background_color(handle, GTK_STATE_FLAG_NORMAL, back != DW_CLR_DEFAULT ? &backcolor : NULL);
+   gtk_widget_override_background_color(handle, GTK_STATE_FLAG_ACTIVE, back != DW_CLR_DEFAULT ? &backcolor : NULL);
 
    _save_gdk_colors(handle, forecolor, backcolor);
 
@@ -7571,8 +7569,6 @@
  */
 void dw_pixmap_set_transparent_color(HPIXMAP pixmap, unsigned long color)
 {
-   pixmap = pixmap;
-   color = color;
 }
 
 /*
@@ -8540,8 +8536,7 @@
    rc = pthread_create(&gtkthread, NULL, (void *)_dwthreadstart, (void *)tmp);
    if ( rc == 0 )
       return gtkthread;
-   else
-      return rc;
+   return (DWTID)DW_ERROR_UNKNOWN;
 }
 
 /*