Mercurial > dwindows

changeset 914:61732be875c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed a bunch of warnings reported by clang using GTK2. There appears to be some broken GTK1 code in dw_window_get_font()... will need to check that out at some point but I don't have a GTK1 environment active.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 21 Apr 2011 22:53:05 +0000
parents 81059acce901
children 361d80388dc9
files gtk/dw.c
diffstat 1 files changed, 10 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/dw.c	Thu Apr 21 22:21:15 2011 +0000
+++ b/gtk/dw.c	Thu Apr 21 22:53:05 2011 +0000
@@ -635,6 +635,8 @@
    *y = child->y;
 }
 
+/* These aren't used... but leaving them here for completeness */
+#if 0
 static void gtk_mdi_tile(GtkMdi *mdi)
 {
    int i, n;
@@ -706,6 +708,7 @@
 
    return child->state;
 }
+#endif
 
 static void gtk_mdi_set_state(GtkMdi *mdi, GtkWidget *widget, GtkMdiChildState state)
 {
@@ -2842,7 +2845,6 @@
    char *font;
    char *retfont=NULL;
    int _locked_by_me = FALSE;
-   gpointer data;
 
    DW_MUTEX_LOCK;
    if(GTK_IS_SCROLLED_WINDOW(handle))
@@ -2853,7 +2855,6 @@
    }
 
 #if GTK_MAJOR_VERSION < 2
-????
    /* Free old font if it exists */
    gdkfont = (GdkFont *)gtk_object_get_data(GTK_OBJECT(handle2), "_dw_gdkfont");
    if(gdkfont)
@@ -2864,15 +2865,6 @@
    gtk_object_set_data(GTK_OBJECT(handle2), "_dw_gdkfont", (gpointer)gdkfont);
 #endif
 
-#if 0
-   /* Free old font name if one is allocated */
-   data = gtk_object_get_data(GTK_OBJECT(handle2), "_dw_fontname");
-   if(data)
-      free(data);
-
-   gtk_object_set_data(GTK_OBJECT(handle2), "_dw_fontname", (gpointer)font);
-#endif
-
 #if GTK_MAJOR_VERSION > 1
    pcontext = gtk_widget_get_pango_context( handle2 );
    if ( pcontext )
@@ -3270,9 +3262,9 @@
 
    DW_MUTEX_LOCK;
    if ( orient == DW_HORZ )
-      adjustment = gtk_scrolled_window_get_hadjustment( handle );
+      adjustment = gtk_scrolled_window_get_hadjustment( GTK_SCROLLED_WINDOW(handle) );
    else
-      adjustment = gtk_scrolled_window_get_vadjustment( handle );
+      adjustment = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(handle) );
    if (adjustment)
       val = _round_value(adjustment->value);
    DW_MUTEX_UNLOCK;
@@ -3295,9 +3287,9 @@
 
    DW_MUTEX_LOCK;
    if ( orient == DW_HORZ )
-      adjustment = gtk_scrolled_window_get_hadjustment( handle );
+      adjustment = gtk_scrolled_window_get_hadjustment( GTK_SCROLLED_WINDOW(handle) );
    else
-      adjustment = gtk_scrolled_window_get_vadjustment( handle );
+      adjustment = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(handle) );
    if (adjustment)
    {
       range = _round_value(adjustment->upper);
@@ -8961,7 +8953,7 @@
    if ( rc == 0 )
       return gtkthread;
    else
-      return rc;
+      return (DWTID)rc;
 }
 
 /*
@@ -9686,7 +9678,7 @@
 
       if(addtext)
       {
-         char *defstr = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(handle2)->entry));
+         const char *defstr = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(handle2)->entry));
          tmp = g_list_append(tmp, addtext);
          gtk_object_set_user_data(GTK_OBJECT(handle2), tmp);
          gtk_combo_set_popdown_strings(GTK_COMBO(handle2), tmp);
@@ -10873,8 +10865,7 @@
    char *filename = NULL;
    char buf[1000];
    char mypath[PATH_MAX+1];
-   char cwd[PATH_MAX+1];
-
+ 
    switch (flags )
    {
       case DW_DIRECTORY_OPEN:
@@ -10931,7 +10922,6 @@
    if ( gtk_dialog_run( GTK_DIALOG( filew ) ) == GTK_RESPONSE_ACCEPT )
    {
       filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( filew ) );
-//      g_free (filename);
    }
 
    gtk_widget_destroy( filew );