diff --git a/src/dialogs/print/print.c b/src/dialogs/print/print.c index a0e8d81..17c3019 100644 --- a/src/dialogs/print/print.c +++ b/src/dialogs/print/print.c @@ -81,7 +81,9 @@ if(operation->contents.dynamic) { #pragma GCC diagnostic push +#ifdef _WIN32 #pragma GCC diagnostic ignored "-Wcast-function-type" +#endif // _WIN32 g_list_free_full(operation->contents.dynamic,(GDestroyNotify) lib3270_free); operation->contents.dynamic = NULL; diff --git a/src/selection/selection.c b/src/selection/selection.c index 1a467ec..e39d4e9 100644 --- a/src/selection/selection.c +++ b/src/selection/selection.c @@ -43,7 +43,9 @@ void v3270_clear_selection(v3270 *terminal) if(terminal->selection.blocks) { #pragma GCC diagnostic push +#ifdef _WIN32 #pragma GCC diagnostic ignored "-Wcast-function-type" +#endif // _WIN32 g_list_free_full(terminal->selection.blocks,(GDestroyNotify) lib3270_free); diff --git a/src/terminal/font/actions.c b/src/terminal/font/actions.c index 6e8f737..9c064fd 100644 --- a/src/terminal/font/actions.c +++ b/src/terminal/font/actions.c @@ -32,30 +32,6 @@ /*--[ Implement ]------------------------------------------------------------------------------------*/ -/* -static void update_font_size(v3270 * terminal, cairo_t *cr, gint width, gint height, int step) -{ - - - cairo_set_font_face(cr,terminal->font.face); - - cairo_set_font_size(cr,terminal->font.size); - - v3270_update_font_metrics(terminal, width, height); - - if(terminal->font.scaled) - cairo_scaled_font_destroy(terminal->font.scaled); - - terminal->font.scaled = cairo_get_scaled_font(cr); - cairo_scaled_font_reference(terminal->font.scaled); - - v3270_redraw(terminal, cr, width, height); - - gtk_widget_queue_draw(GTK_WIDGET(terminal)); - -} -*/ - void v3270_zoom_best(GtkWidget *widget) { debug("%s",__FUNCTION__); diff --git a/src/terminal/properties/init.c b/src/terminal/properties/init.c index 00d7725..0be4ed7 100644 --- a/src/terminal/properties/init.c +++ b/src/terminal/properties/init.c @@ -231,9 +231,9 @@ uint_props[ix].name, uint_props[ix].name, uint_props[ix].description, - 0, // Minimo - UINT_MAX, // Máximo - 0, // Default + uint_props[ix].min, // Minimo + (uint_props[ix].max ? uint_props[ix].max : UINT_MAX), // Máximo + (uint_props[ix].default_value ? uint_props[ix].default_value : uint_props[ix].min), // Default (uint_props[ix].set == NULL ? G_PARAM_READABLE : (G_PARAM_READABLE|G_PARAM_WRITABLE)) ); diff --git a/src/terminal/widget.c b/src/terminal/widget.c index 0b0d5a7..3e07619 100644 --- a/src/terminal/widget.c +++ b/src/terminal/widget.c @@ -475,7 +475,7 @@ static void release_activity_timer(v3270 *widget) static void v3270_init(v3270 *widget) { - widget->host = lib3270_session_new(""); + widget->host = lib3270_session_new(NULL); lib3270_set_user_data(widget->host,widget); // Install callbacks @@ -627,7 +627,6 @@ static void release_cursor_timer(v3270 *widget) static void v3270_realize(GtkWidget * widget) { -#if GTK_CHECK_VERSION(2,18,0) if(!gtk_widget_get_has_window(widget)) { GTK_WIDGET_CLASS(v3270_parent_class)->realize(widget); @@ -661,49 +660,6 @@ static void v3270_realize(GtkWidget * widget) gtk_im_context_set_client_window(GTK_V3270(widget)->input_method,window); } -#else - { - if(GTK_WIDGET_NO_WINDOW (widget)) - { - GTK_WIDGET_CLASS(v3270_parent_class)->realize (widget); - } - else - { - GdkWindowAttr attributes; - gint attributes_mask; - - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); - - memset(&attributes,0,sizeof(attributes)); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x; - attributes.y = widget->allocation.y; - attributes.width = widget->allocation.width; - attributes.height = widget->allocation.height; - attributes.wclass = GDK_INPUT_OUTPUT; - attributes.visual = gtk_widget_get_visual (widget); - attributes.colormap = gtk_widget_get_colormap (widget); - attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK; - - attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; - - widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),&attributes, attributes_mask); - gdk_window_set_user_data(widget->window, widget); - - widget->style = gtk_style_attach (widget->style, widget->window); - gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); - } - - gtk_im_context_set_client_window(GTK_V3270(widget)->input_method,widget->window); - } - -#endif // GTK(2,18,0) - -#if !GTK_CHECK_VERSION(3,0,0) - widget->style = gtk_style_attach (widget->style, widget->window); - gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); -#endif // !GTK3 v3270_reconfigure(GTK_V3270(widget)); -- libgit2 0.21.2