Mercurial > dwindows
comparison gtk/dw.c @ 914:61732be875c7
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 | 1006f10040ef |
children | 5c5447fd0cc9 |
comparison
equal
deleted
inserted
replaced
913:81059acce901 | 914:61732be875c7 |
---|---|
633 | 633 |
634 *x = child->x; | 634 *x = child->x; |
635 *y = child->y; | 635 *y = child->y; |
636 } | 636 } |
637 | 637 |
638 /* These aren't used... but leaving them here for completeness */ | |
639 #if 0 | |
638 static void gtk_mdi_tile(GtkMdi *mdi) | 640 static void gtk_mdi_tile(GtkMdi *mdi) |
639 { | 641 { |
640 int i, n; | 642 int i, n; |
641 int width, height; | 643 int width, height; |
642 GList *children; | 644 GList *children; |
704 child = get_child (mdi, widget); | 706 child = get_child (mdi, widget); |
705 g_return_val_if_fail (child, CHILD_NORMAL); | 707 g_return_val_if_fail (child, CHILD_NORMAL); |
706 | 708 |
707 return child->state; | 709 return child->state; |
708 } | 710 } |
711 #endif | |
709 | 712 |
710 static void gtk_mdi_set_state(GtkMdi *mdi, GtkWidget *widget, GtkMdiChildState state) | 713 static void gtk_mdi_set_state(GtkMdi *mdi, GtkWidget *widget, GtkMdiChildState state) |
711 { | 714 { |
712 GtkMdiChild *child; | 715 GtkMdiChild *child; |
713 | 716 |
2840 #endif | 2843 #endif |
2841 GtkWidget *handle2 = handle; | 2844 GtkWidget *handle2 = handle; |
2842 char *font; | 2845 char *font; |
2843 char *retfont=NULL; | 2846 char *retfont=NULL; |
2844 int _locked_by_me = FALSE; | 2847 int _locked_by_me = FALSE; |
2845 gpointer data; | |
2846 | 2848 |
2847 DW_MUTEX_LOCK; | 2849 DW_MUTEX_LOCK; |
2848 if(GTK_IS_SCROLLED_WINDOW(handle)) | 2850 if(GTK_IS_SCROLLED_WINDOW(handle)) |
2849 { | 2851 { |
2850 GtkWidget *tmp = (GtkWidget *)gtk_object_get_user_data(GTK_OBJECT(handle)); | 2852 GtkWidget *tmp = (GtkWidget *)gtk_object_get_user_data(GTK_OBJECT(handle)); |
2851 if(tmp) | 2853 if(tmp) |
2852 handle2 = tmp; | 2854 handle2 = tmp; |
2853 } | 2855 } |
2854 | 2856 |
2855 #if GTK_MAJOR_VERSION < 2 | 2857 #if GTK_MAJOR_VERSION < 2 |
2856 ???? | |
2857 /* Free old font if it exists */ | 2858 /* Free old font if it exists */ |
2858 gdkfont = (GdkFont *)gtk_object_get_data(GTK_OBJECT(handle2), "_dw_gdkfont"); | 2859 gdkfont = (GdkFont *)gtk_object_get_data(GTK_OBJECT(handle2), "_dw_gdkfont"); |
2859 if(gdkfont) | 2860 if(gdkfont) |
2860 gdk_font_unref(gdkfont); | 2861 gdk_font_unref(gdkfont); |
2861 gdkfont = gdk_font_load(fontname); | 2862 gdkfont = gdk_font_load(fontname); |
2862 if(!gdkfont) | 2863 if(!gdkfont) |
2863 gdkfont = gdk_font_load("fixed"); | 2864 gdkfont = gdk_font_load("fixed"); |
2864 gtk_object_set_data(GTK_OBJECT(handle2), "_dw_gdkfont", (gpointer)gdkfont); | 2865 gtk_object_set_data(GTK_OBJECT(handle2), "_dw_gdkfont", (gpointer)gdkfont); |
2865 #endif | 2866 #endif |
2866 | 2867 |
2867 #if 0 | |
2868 /* Free old font name if one is allocated */ | |
2869 data = gtk_object_get_data(GTK_OBJECT(handle2), "_dw_fontname"); | |
2870 if(data) | |
2871 free(data); | |
2872 | |
2873 gtk_object_set_data(GTK_OBJECT(handle2), "_dw_fontname", (gpointer)font); | |
2874 #endif | |
2875 | |
2876 #if GTK_MAJOR_VERSION > 1 | 2868 #if GTK_MAJOR_VERSION > 1 |
2877 pcontext = gtk_widget_get_pango_context( handle2 ); | 2869 pcontext = gtk_widget_get_pango_context( handle2 ); |
2878 if ( pcontext ) | 2870 if ( pcontext ) |
2879 { | 2871 { |
2880 pfont = pango_context_get_font_description( pcontext ); | 2872 pfont = pango_context_get_font_description( pcontext ); |
3268 if (!handle) | 3260 if (!handle) |
3269 return -1; | 3261 return -1; |
3270 | 3262 |
3271 DW_MUTEX_LOCK; | 3263 DW_MUTEX_LOCK; |
3272 if ( orient == DW_HORZ ) | 3264 if ( orient == DW_HORZ ) |
3273 adjustment = gtk_scrolled_window_get_hadjustment( handle ); | 3265 adjustment = gtk_scrolled_window_get_hadjustment( GTK_SCROLLED_WINDOW(handle) ); |
3274 else | 3266 else |
3275 adjustment = gtk_scrolled_window_get_vadjustment( handle ); | 3267 adjustment = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(handle) ); |
3276 if (adjustment) | 3268 if (adjustment) |
3277 val = _round_value(adjustment->value); | 3269 val = _round_value(adjustment->value); |
3278 DW_MUTEX_UNLOCK; | 3270 DW_MUTEX_UNLOCK; |
3279 return val; | 3271 return val; |
3280 } | 3272 } |
3293 if (!handle) | 3285 if (!handle) |
3294 return -1; | 3286 return -1; |
3295 | 3287 |
3296 DW_MUTEX_LOCK; | 3288 DW_MUTEX_LOCK; |
3297 if ( orient == DW_HORZ ) | 3289 if ( orient == DW_HORZ ) |
3298 adjustment = gtk_scrolled_window_get_hadjustment( handle ); | 3290 adjustment = gtk_scrolled_window_get_hadjustment( GTK_SCROLLED_WINDOW(handle) ); |
3299 else | 3291 else |
3300 adjustment = gtk_scrolled_window_get_vadjustment( handle ); | 3292 adjustment = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(handle) ); |
3301 if (adjustment) | 3293 if (adjustment) |
3302 { | 3294 { |
3303 range = _round_value(adjustment->upper); | 3295 range = _round_value(adjustment->upper); |
3304 } | 3296 } |
3305 DW_MUTEX_UNLOCK; | 3297 DW_MUTEX_UNLOCK; |
8959 | 8951 |
8960 rc = pthread_create(>kthread, NULL, (void *)_dwthreadstart, (void *)tmp); | 8952 rc = pthread_create(>kthread, NULL, (void *)_dwthreadstart, (void *)tmp); |
8961 if ( rc == 0 ) | 8953 if ( rc == 0 ) |
8962 return gtkthread; | 8954 return gtkthread; |
8963 else | 8955 else |
8964 return rc; | 8956 return (DWTID)rc; |
8965 } | 8957 } |
8966 | 8958 |
8967 /* | 8959 /* |
8968 * Ends execution of current thread immediately. | 8960 * Ends execution of current thread immediately. |
8969 */ | 8961 */ |
9684 GList *tmp = (GList *)gtk_object_get_user_data(GTK_OBJECT(handle2)); | 9676 GList *tmp = (GList *)gtk_object_get_user_data(GTK_OBJECT(handle2)); |
9685 char *addtext = strdup(text); | 9677 char *addtext = strdup(text); |
9686 | 9678 |
9687 if(addtext) | 9679 if(addtext) |
9688 { | 9680 { |
9689 char *defstr = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(handle2)->entry)); | 9681 const char *defstr = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(handle2)->entry)); |
9690 tmp = g_list_append(tmp, addtext); | 9682 tmp = g_list_append(tmp, addtext); |
9691 gtk_object_set_user_data(GTK_OBJECT(handle2), tmp); | 9683 gtk_object_set_user_data(GTK_OBJECT(handle2), tmp); |
9692 gtk_combo_set_popdown_strings(GTK_COMBO(handle2), tmp); | 9684 gtk_combo_set_popdown_strings(GTK_COMBO(handle2), tmp); |
9693 gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(handle2)->entry), defstr); | 9685 gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(handle2)->entry), defstr); |
9694 } | 9686 } |
10871 GtkFileFilter *filter2 = NULL; | 10863 GtkFileFilter *filter2 = NULL; |
10872 gchar *button; | 10864 gchar *button; |
10873 char *filename = NULL; | 10865 char *filename = NULL; |
10874 char buf[1000]; | 10866 char buf[1000]; |
10875 char mypath[PATH_MAX+1]; | 10867 char mypath[PATH_MAX+1]; |
10876 char cwd[PATH_MAX+1]; | 10868 |
10877 | |
10878 switch (flags ) | 10869 switch (flags ) |
10879 { | 10870 { |
10880 case DW_DIRECTORY_OPEN: | 10871 case DW_DIRECTORY_OPEN: |
10881 action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER; | 10872 action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER; |
10882 button = GTK_STOCK_OPEN; | 10873 button = GTK_STOCK_OPEN; |
10929 } | 10920 } |
10930 | 10921 |
10931 if ( gtk_dialog_run( GTK_DIALOG( filew ) ) == GTK_RESPONSE_ACCEPT ) | 10922 if ( gtk_dialog_run( GTK_DIALOG( filew ) ) == GTK_RESPONSE_ACCEPT ) |
10932 { | 10923 { |
10933 filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( filew ) ); | 10924 filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( filew ) ); |
10934 // g_free (filename); | |
10935 } | 10925 } |
10936 | 10926 |
10937 gtk_widget_destroy( filew ); | 10927 gtk_widget_destroy( filew ); |
10938 return filename; | 10928 return filename; |
10939 #else | 10929 #else |