Download as
Browse Code »

Commit 96ac1460889d79d5ae9b332ec9d7c48250046f93

Authored by Perry Werneck
1 parent 860f70b3
Exists in master and in 1 other branch develop

Adjustments in trace widget.

Showing 3 changed files with 28 additions and 3 deletions   Show diff stats
src/include/v3270/trace.h
  Diff comments   View file @96ac146
@@ -52,6 +52,9 @@ @@ -52,6 +52,9 @@
52 LIB3270_EXPORT void v3270_trace_vprintf(GtkWidget *widget, const char *fmt, va_list args); 52 LIB3270_EXPORT void v3270_trace_vprintf(GtkWidget *widget, const char *fmt, va_list args);
53 LIB3270_EXPORT void v3270_trace_printf(GtkWidget *widget, const char *fmt, ... ); 53 LIB3270_EXPORT void v3270_trace_printf(GtkWidget *widget, const char *fmt, ... );
54 54
  55 + LIB3270_EXPORT GtkWidget * v3270_trace_get_button_box(GtkWidget *widget);
  56 + LIB3270_EXPORT void v3270_trace_button_box_insert(GtkWidget *widget, GtkWidget *button);
  57 +
55 LIB3270_EXPORT void v3270_trace_save(GtkWidget *widget); 58 LIB3270_EXPORT void v3270_trace_save(GtkWidget *widget);
56 LIB3270_EXPORT void v3270_trace_select_file(GtkWidget *widget); 59 LIB3270_EXPORT void v3270_trace_select_file(GtkWidget *widget);
57 60
src/testprogram/toolbar.c
  Diff comments   View file @96ac146
@@ -201,7 +201,7 @@ @@ -201,7 +201,7 @@
201 GtkWidget * toolbar = gtk_toolbar_new(); 201 GtkWidget * toolbar = gtk_toolbar_new();
202 for(f = 0; f < G_N_ELEMENTS(buttons); f++) 202 for(f = 0; f < G_N_ELEMENTS(buttons); f++)
203 { 203 {
204 - GtkWidget * button = gtk_tool_button_new(gtk_image_new_from_icon_name(buttons[f].icon,GTK_ICON_SIZE_SMALL_TOOLBAR),"-"); 204 + GtkWidget * button = GTK_WIDGET(gtk_tool_button_new(gtk_image_new_from_icon_name(buttons[f].icon,GTK_ICON_SIZE_SMALL_TOOLBAR),"-"));
205 205
206 gtk_widget_set_tooltip_markup(button,buttons[f].tooltip); 206 gtk_widget_set_tooltip_markup(button,buttons[f].tooltip);
207 g_signal_connect(G_OBJECT(button),"clicked",buttons[f].callback,terminal); 207 g_signal_connect(G_OBJECT(button),"clicked",buttons[f].callback,terminal);
src/trace/trace.c
  Diff comments   View file @96ac146
@@ -316,10 +316,32 @@ @@ -316,10 +316,32 @@
316 } 316 }
317 317
318 318
  319 + LIB3270_EXPORT GtkWidget * v3270_trace_get_button_box(GtkWidget *widget)
  320 + {
  321 + g_return_val_if_fail(GTK_IS_V3270_TRACE(widget),NULL);
  322 +
  323 + return GTK_V3270_TRACE(widget)->buttons;
  324 +
  325 + }
  326 +
  327 + LIB3270_EXPORT void v3270_trace_button_box_insert(GtkWidget *widget, GtkWidget *button)
  328 + {
  329 + g_return_if_fail(GTK_IS_V3270_TRACE(widget));
  330 +
  331 + gtk_widget_set_can_focus(button,FALSE);
  332 + gtk_widget_set_can_default(button,FALSE);
  333 +
  334 +#if GTK_CHECK_VERSION(3,20,0)
  335 + gtk_widget_set_focus_on_click(button,FALSE);
  336 +#endif // GTK 3,20,0
  337 +
  338 + gtk_box_pack_start(GTK_BOX(GTK_V3270_TRACE(widget)->buttons),button,FALSE,FALSE,0);
  339 +
  340 + }
  341 +
319 LIB3270_EXPORT GtkWidget * v3270_trace_new(GtkWidget *terminal) 342 LIB3270_EXPORT GtkWidget * v3270_trace_new(GtkWidget *terminal)
320 { 343 {
321 g_return_val_if_fail(GTK_IS_V3270(terminal),NULL); 344 g_return_val_if_fail(GTK_IS_V3270(terminal),NULL);
322 -  
323 V3270Trace * widget = GTK_V3270_TRACE(g_object_new(GTK_TYPE_V3270_TRACE, NULL)); 345 V3270Trace * widget = GTK_V3270_TRACE(g_object_new(GTK_TYPE_V3270_TRACE, NULL));
324 346
325 // Set terminal widget 347 // Set terminal widget
@@ -346,7 +368,7 @@ @@ -346,7 +368,7 @@
346 gtk_widget_set_focus_on_click(item,FALSE); 368 gtk_widget_set_focus_on_click(item,FALSE);
347 #endif // GTK 3,20,0 369 #endif // GTK 3,20,0
348 370
349 - gtk_box_pack_start(GTK_BOX(widget->buttons),item,FALSE,FALSE,4); 371 + gtk_box_pack_start(GTK_BOX(widget->buttons),item,FALSE,FALSE,0);
350 372
351 } 373 }
352 } 374 }