Download as
Browse Code »

Commit 16dae7e5b332321e2f63ba843dfaecee6902b6ac

Authored by perry.werneck@gmail.com
1 parent 0b280c57
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Retirando warnings ao compilar para windows 64

Showing 6 changed files with 29 additions and 27 deletions   Show diff stats
src/pw3270/actions.c
  Diff comments   View file @16dae7e
... ... @@ -285,7 +285,7 @@ static void connect_standard_action(GtkAction *action, GtkWidget *widget, const
285 285  
286 286 static void lib3270_toggle_action(GtkToggleAction *action,GtkWidget *widget)
287 287 {
288   - LIB3270_TOGGLE toggle = (LIB3270_TOGGLE) g_object_get_data(G_OBJECT(action),"toggle_id");
  288 + LIB3270_TOGGLE toggle = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
289 289  
290 290 lib3270_trace_event(NULL,"Action %s toggled on widget %p (id=%d)\n",gtk_action_get_name(GTK_ACTION(action)),widget,(int) toggle);
291 291  
... ... @@ -298,17 +298,17 @@ static void lib3270_toggle_action(GtkToggleAction *action,GtkWidget *widget)
298 298 static void selection_move_action(GtkAction *action, GtkWidget *widget)
299 299 {
300 300 trace_action(action,widget);
301   - lib3270_move_selection(v3270_get_session(widget),(LIB3270_DIRECTION) g_object_get_data(G_OBJECT(action),"direction"));
  301 + lib3270_move_selection(v3270_get_session(widget),(LIB3270_DIRECTION) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"direction")));
302 302 }
303 303  
304 304 static void cursor_move_action(GtkAction *action, GtkWidget *widget)
305 305 {
306   - int flags = (int) g_object_get_data(G_OBJECT(action),"move_flags");
  306 + int flags = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"move_flags"));
307 307  
308 308 lib3270_trace_event(NULL,"Action %s activated on widget %p flags=%04x\n",
309 309 gtk_action_get_name(action),
310 310 widget,
311   - (unsigned int) g_object_get_data(G_OBJECT(action),"move_flags"));
  311 + (unsigned int) flags);
312 312  
313 313 lib3270_move_cursor(v3270_get_session(widget),(LIB3270_DIRECTION) (flags & 0x03), (flags & 0x80) );
314 314 }
... ... @@ -323,12 +323,12 @@ static void connect_move_action(GtkAction *action, GtkWidget *widget, const gcha
323 323  
324 324 if(!g_ascii_strcasecmp(target,"selection"))
325 325 {
326   - g_object_set_data(G_OBJECT(action),"direction",(gpointer) (flags & 3));
  326 + g_object_set_data(G_OBJECT(action),"direction",GINT_TO_POINTER((flags & 3)));
327 327 g_signal_connect(action,"activate",G_CALLBACK(selection_move_action),widget);
328 328 }
329 329 else if(!g_ascii_strcasecmp(target,"cursor"))
330 330 {
331   - g_object_set_data(G_OBJECT(action),"move_flags",(gpointer) ((int) flags));
  331 + g_object_set_data(G_OBJECT(action),"move_flags",GINT_TO_POINTER( ((int) flags)));
332 332 g_signal_connect(action,"activate",G_CALLBACK(cursor_move_action),widget);
333 333 }
334 334 else
... ... @@ -343,26 +343,28 @@ static void connect_move_action(GtkAction *action, GtkWidget *widget, const gcha
343 343  
344 344 static void action_pfkey(GtkAction *action, GtkWidget *widget)
345 345 {
346   - lib3270_trace_event(NULL,"Action %s activated on widget %p key=%p\n",gtk_action_get_name(action),widget,g_object_get_data(G_OBJECT(action),"pfkey"));
347   - lib3270_pfkey(v3270_get_session(widget),(int) g_object_get_data(G_OBJECT(action),"pfkey"));
  346 + int key = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"pfkey"));
  347 + lib3270_trace_event(NULL,"Action %s activated on widget %p key=%d\n",gtk_action_get_name(action),widget,key);
  348 + lib3270_pfkey(v3270_get_session(widget),key);
348 349 }
349 350  
350 351 static void action_pakey(GtkAction *action, GtkWidget *widget)
351 352 {
352   - lib3270_trace_event(NULL,"Action %s activated on widget %p key=%p\n",gtk_action_get_name(action),widget,g_object_get_data(G_OBJECT(action),"pakey"));
353   - lib3270_pakey(v3270_get_session(widget),(int) g_object_get_data(G_OBJECT(action),"pakey"));
  353 + int key = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"pakey"));
  354 + lib3270_trace_event(NULL,"Action %s activated on widget %p key=%d\n",gtk_action_get_name(action),widget,key);
  355 + lib3270_pakey(v3270_get_session(widget),key);
354 356 }
355 357  
356 358 static void action_set_toggle(GtkAction *action, GtkWidget *widget)
357 359 {
358   - LIB3270_TOGGLE id = (LIB3270_TOGGLE) g_object_get_data(G_OBJECT(action),"toggle_id");
  360 + LIB3270_TOGGLE id = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
359 361 lib3270_trace_event(NULL,"Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id);
360 362 lib3270_set_toggle(v3270_get_session(widget),id,1);
361 363 }
362 364  
363 365 static void action_reset_toggle(GtkAction *action, GtkWidget *widget)
364 366 {
365   - LIB3270_TOGGLE id = (LIB3270_TOGGLE) g_object_get_data(G_OBJECT(action),"toggle_id");
  367 + LIB3270_TOGGLE id = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
366 368 lib3270_trace_event(NULL,"Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id);
367 369 lib3270_set_toggle(v3270_get_session(widget),id,0);
368 370 }
... ... @@ -682,7 +684,7 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
682 684 action = GTK_ACTION(gtk_toggle_action_new(nm,NULL,NULL,NULL));
683 685 if(id < LIB3270_TOGGLE_COUNT)
684 686 toggle_action[id] = action;
685   - g_object_set_data(G_OBJECT(action),"toggle_id",(gpointer) id);
  687 + g_object_set_data(G_OBJECT(action),"toggle_id",GINT_TO_POINTER(id));
686 688 gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action),(lib3270_get_toggle(v3270_get_session(widget),id) != 0));
687 689 g_signal_connect(action,"toggled",G_CALLBACK(lib3270_toggle_action),widget);
688 690 break;
... ... @@ -694,25 +696,25 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
694 696  
695 697 case ACTION_TYPE_PFKEY:
696 698 action = gtk_action_new(nm,NULL,NULL,NULL);
697   - g_object_set_data(G_OBJECT(action),"pfkey",(gpointer) id);
  699 + g_object_set_data(G_OBJECT(action),"pfkey",GINT_TO_POINTER(id));
698 700 g_signal_connect(action,"activate",G_CALLBACK(action_pfkey),widget);
699 701 break;
700 702  
701 703 case ACTION_TYPE_PAKEY:
702 704 action = gtk_action_new(nm,NULL,NULL,NULL);
703   - g_object_set_data(G_OBJECT(action),"pakey",(gpointer) id);
  705 + g_object_set_data(G_OBJECT(action),"pakey",GINT_TO_POINTER(id));
704 706 g_signal_connect(action,"activate",G_CALLBACK(action_pakey),widget);
705 707 break;
706 708  
707 709 case ACTION_TYPE_SET:
708 710 action = gtk_action_new(nm,NULL,NULL,NULL);
709   - g_object_set_data(G_OBJECT(action),"toggle_id",(gpointer) id);
  711 + g_object_set_data(G_OBJECT(action),"toggle_id",GINT_TO_POINTER(id));
710 712 g_signal_connect(action,"activate",G_CALLBACK(action_set_toggle),widget);
711 713 break;
712 714  
713 715 case ACTION_TYPE_RESET:
714 716 action = gtk_action_new(nm,NULL,NULL,NULL);
715   - g_object_set_data(G_OBJECT(action),"toggle_id",(gpointer) id);
  717 + g_object_set_data(G_OBJECT(action),"toggle_id",GINT_TO_POINTER(id));
716 718 g_signal_connect(action,"activate",G_CALLBACK(action_reset_toggle),widget);
717 719 break;
718 720  
... ...
src/pw3270/colors.c
  Diff comments   View file @16dae7e
... ... @@ -177,7 +177,7 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
177 177 if(colorsel)
178 178 {
179 179 // Update color selection widget
180   - int id = (int) g_object_get_data(G_OBJECT(colorsel),"colorid");
  180 + int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(colorsel),"colorid"));
181 181 if(id >= 0 && id < V3270_COLOR_COUNT)
182 182 gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel),clr+id);
183 183 }
... ... @@ -314,7 +314,7 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
314 314 static void color_changed(GtkColorSelection *colorselection, GtkWidget *widget)
315 315 {
316 316 GdkColor clr;
317   - int id = (int) g_object_get_data(G_OBJECT(colorselection),"colorid");
  317 + int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(colorselection),"colorid"));
318 318  
319 319 if(id < 0 || id >= V3270_COLOR_COUNT)
320 320 return;
... ... @@ -347,7 +347,7 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
347 347 if(id < 0 || id >= V3270_COLOR_COUNT)
348 348 return;
349 349  
350   - g_object_set_data(G_OBJECT(color),"colorid",(gpointer) id);
  350 + g_object_set_data(G_OBJECT(color),"colorid",GINT_TO_POINTER(id));
351 351 clr = v3270_get_color(widget,id);
352 352  
353 353 gtk_color_selection_set_previous_color(GTK_COLOR_SELECTION(color),saved+id);
... ...
src/pw3270/common/config.c
  Diff comments   View file @16dae7e
... ... @@ -158,7 +158,7 @@ gchar * get_last_error_msg(void)
158 158  
159 159 gboolean registry_get_double(HKEY hKey, const gchar *key, gdouble *value)
160 160 {
161   - GError * error = NULL;
  161 +// GError * error = NULL;
162 162 BYTE data[4096];
163 163 unsigned long datatype;
164 164 unsigned long datalen = sizeof(data);
... ...
src/pw3270/uiparser/action.c
  Diff comments   View file @16dae7e
... ... @@ -64,7 +64,7 @@
64 64 return;
65 65 }
66 66  
67   - g_object_set_data(G_OBJECT(action),"id_group",(gpointer) id);
  67 + g_object_set_data(G_OBJECT(action),"id_group",GINT_TO_POINTER(id));
68 68  
69 69 }
70 70 else if(!g_ascii_strcasecmp(name[f],"icon"))
... ... @@ -105,7 +105,7 @@
105 105 }
106 106 else if(!g_ascii_strcasecmp(name[f],"id"))
107 107 {
108   - g_object_set_data(G_OBJECT(action),"action_id",(gpointer) atoi(value[f]));
  108 + g_object_set_data(G_OBJECT(action),"action_id",GINT_TO_POINTER(atoi(value[f])));
109 109 }
110 110 else
111 111 {
... ...
src/pw3270/uiparser/parser.c
  Diff comments   View file @16dae7e
... ... @@ -108,7 +108,7 @@ struct action_info
108 108  
109 109 static void action_group_setup(gpointer key, GtkAction *action, struct action_info *info)
110 110 {
111   - int group_id = (int) g_object_get_data(G_OBJECT(action),"id_group");
  111 + int group_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"id_group"));
112 112  
113 113 gtk_action_set_accel_group(action,info->accel_group);
114 114  
... ...
src/pw3270/window.c
  Diff comments   View file @16dae7e
... ... @@ -211,8 +211,8 @@
211 211 {
212 212 if(gtk_check_menu_item_get_active(item))
213 213 {
214   - trace("screen model on widget %p changes to %d",widget,(int) g_object_get_data(G_OBJECT(item),"mode_3270"));
215   - lib3270_set_model(v3270_get_session(widget),(int) g_object_get_data(G_OBJECT(item),"mode_3270"));
  214 + trace("screen model on widget %p changes to %d",widget,GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item),"mode_3270")));
  215 + lib3270_set_model(v3270_get_session(widget),GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item),"mode_3270")));
216 216 }
217 217 }
218 218  
... ... @@ -234,7 +234,7 @@
234 234 item = gtk_radio_menu_item_new_with_label(group,name);
235 235 g_free(name);
236 236  
237   - g_object_set_data(G_OBJECT(item),"mode_3270",(gpointer) (f+2));
  237 + g_object_set_data(G_OBJECT(item),"mode_3270",GINT_TO_POINTER((f+2)));
238 238  
239 239 group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(item));
240 240  
... ...