#define MAX_BUFFER 256
-#define GTK_ENABLE_BROKEN
#define MAX_GROUPS 20
#define MAX_NAME_VALUE 20
+#include "config.h"
+
#include <sys/types.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <unistd.h>
#include <stdlib.h>
#include <strings.h>
+
#include "testlib.h"
-#include "config.h"
typedef enum
{
static void _festival_write (const gchar *command_string, int fd)
{
+ gssize n_bytes;
+
if (fd < 0) {
perror("socket");
return;
}
- write(fd, command_string, strlen(command_string));
+ n_bytes = write(fd, command_string, strlen(command_string));
+ g_assert (n_bytes == strlen(command_string));
}
static void _speak_caret_event (AtkObject *aobject)
*/
if (aobject != NULL)
{
- if (GTK_ACCESSIBLE(toplevel)->widget == mainWindow)
- {
+ GtkWidget *widget;
+
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (toplevel));
+ if (widget == mainWindow)
return TRUE;
- }
}
return FALSE;
static gint
_print_object (AtkObject *aobject)
{
+ GtkWidget *widget;
G_CONST_RETURN gchar * parent_name = NULL;
G_CONST_RETURN gchar * name = NULL;
G_CONST_RETURN gchar * description = NULL;
accel_name = "";
}
- if (GTK_IS_ACCESSIBLE (aobject) &&
- GTK_IS_WIDGET (GTK_ACCESSIBLE (aobject)->widget))
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (aobject));
+ if (widget)
{
_print_key_value(tab_n, group_num, "Widget name",
- (gpointer)gtk_widget_get_name(GTK_ACCESSIBLE (aobject)->widget),
+ (gpointer)gtk_widget_get_name (widget),
VALUE_STRING);
}
else
nv->atkobj = ATK_OBJECT(aobject);
nv->action_num = j;
- nv->signal_id = g_signal_connect (GTK_OBJECT (nv->button),
- "clicked", GTK_SIGNAL_FUNC (_action_cb), nv);
+ nv->signal_id = g_signal_connect (nv->button,
+ "clicked", G_CALLBACK (_action_cb), nv);
g_free(label_str);
widget = GTK_WIDGET (object);
if (GTK_IS_WINDOW (widget))
{
- GtkWidget *focus_widget = GTK_WINDOW (widget)->focus_widget;
+ GtkWidget *focus_widget = gtk_window_get_focus (GTK_WINDOW (widget));
if (focus_widget != NULL)
widget = focus_widget;
}
}
else
{
- *new_page = gtk_vpaned_new ();
+ *new_page = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
}
label = gtk_label_new ("");
tab = nbook_tabs[VALUE];
_add_notebook_page (notebook, tab->main_box, &tab->page, "<b>_Value</b>");
- g_signal_connect (GTK_OBJECT (notebook),
- "switch-page",
- GTK_SIGNAL_FUNC (_update_current_page),
- NULL);
+ g_signal_connect (notebook,
+ "switch-page",
+ G_CALLBACK (_update_current_page),
+ NULL);
}
static void
the_tab = g_new0(TabInfo, 1);
the_tab->page = NULL;
- the_tab->main_box = gtk_vbox_new(FALSE, 20);
+ the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
the_tab->name = "Object";
nbook_tabs[OBJECT] = the_tab;
the_tab = g_new0(TabInfo, 1);
the_tab->page = NULL;
- the_tab->main_box = gtk_vbox_new(FALSE, 20);
+ the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
the_tab->name = "Action";
nbook_tabs[ACTION] = the_tab;
the_tab = g_new0(TabInfo, 1);
the_tab->page = NULL;
- the_tab->main_box = gtk_vbox_new(FALSE, 20);
+ the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
the_tab->name = "Component";
nbook_tabs[COMPONENT] = the_tab;
the_tab = g_new0(TabInfo, 1);
the_tab->page = NULL;
- the_tab->main_box = gtk_vbox_new(FALSE, 20);
+ the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
the_tab->name = "Image";
nbook_tabs[IMAGE] = the_tab;
the_tab = g_new0(TabInfo, 1);
the_tab->page = NULL;
- the_tab->main_box = gtk_vbox_new(FALSE, 20);
+ the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
the_tab->name = "Selection";
nbook_tabs[SELECTION] = the_tab;
the_tab = g_new0(TabInfo, 1);
the_tab->page = NULL;
- the_tab->main_box = gtk_vbox_new(FALSE, 20);
+ the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
the_tab->name = "Table";
nbook_tabs[TABLE] = the_tab;
the_tab = g_new0(TabInfo, 1);
the_tab->page = NULL;
- the_tab->main_box = gtk_vbox_new(FALSE, 20);
+ the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
the_tab->name = "Text";
nbook_tabs[TEXT] = the_tab;
the_tab = g_new0(TabInfo, 1);
the_tab->page = NULL;
- the_tab->main_box = gtk_vbox_new(FALSE, 20);
+ the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
the_tab->name = "Value";
nbook_tabs[VALUE] = the_tab;
}
{
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name (window, "Ferret Window");
- gtk_window_set_policy (GTK_WINDOW(window), TRUE, TRUE, FALSE);
- g_signal_connect (GTK_OBJECT (window), "destroy",
- GTK_SIGNAL_FUNC (gtk_widget_destroyed),
- &window);
+ g_signal_connect (window, "destroy",
+ G_CALLBACK (gtk_widget_destroyed),
+ &window);
gtk_window_set_title (GTK_WINDOW (window), "GTK+ Ferret Output");
gtk_window_set_default_size (GTK_WINDOW (window), 333, 550);
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
- vbox1 = gtk_vbox_new (FALSE, 0);
+ vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox1);
gtk_widget_show (vbox1);
gtk_box_pack_start (GTK_BOX (vbox1), menubar, FALSE, TRUE, 0);
gtk_widget_show (menubar);
menutop = gtk_menu_item_new_with_label("Menu");
- gtk_menu_bar_append(GTK_MENU_BAR(menubar), menutop);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menutop);
gtk_widget_show (menutop);
menu = gtk_menu_new();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menutop), menu);
gtk_widget_show (menu);
_add_menu(&menu, &menuitem_trackmouse, "Track Mouse", track_mouse,
- GTK_SIGNAL_FUNC(_toggle_trackmouse));
+ G_CALLBACK(_toggle_trackmouse));
_add_menu(&menu, &menuitem_trackfocus, "Track Focus", track_focus,
- GTK_SIGNAL_FUNC(_toggle_trackfocus));
+ G_CALLBACK(_toggle_trackfocus));
_add_menu(&menu, &menuitem_magnifier, "Magnifier", use_magnifier,
- GTK_SIGNAL_FUNC(_toggle_magnifier));
+ G_CALLBACK(_toggle_magnifier));
_add_menu(&menu, &menuitem_festival, "Festival", use_festival,
- GTK_SIGNAL_FUNC(_toggle_festival));
+ G_CALLBACK(_toggle_festival));
_add_menu(&menu, &menuitem_festival_terse, "Festival Terse",
(!say_role && !say_accel),
- GTK_SIGNAL_FUNC(_toggle_festival_terse));
+ G_CALLBACK(_toggle_festival_terse));
_add_menu(&menu, &menuitem_terminal, "Terminal Output", display_ascii,
- GTK_SIGNAL_FUNC(_toggle_terminal));
+ G_CALLBACK(_toggle_terminal));
_add_menu(&menu, &menuitem_no_signals, "No ATK Signals", no_signals,
- GTK_SIGNAL_FUNC(_toggle_no_signals));
+ G_CALLBACK(_toggle_no_signals));
_create_notebook ();
gtk_container_add (GTK_CONTAINER (vbox1), GTK_WIDGET (notebook));
gtk_widget_show (GTK_WIDGET (notebook));
}
- if (!GTK_WIDGET_VISIBLE (window))
+ if (!gtk_widget_get_visible (window))
gtk_widget_show (window);
mainWindow = GTK_WIDGET (window);
GTK_CHECK_MENU_ITEM(*menuitem), init_value);
gtk_menu_shell_append (GTK_MENU_SHELL (*menu), *menuitem);
gtk_widget_show(*menuitem);
- g_signal_connect(GTK_OBJECT(*menuitem), "toggled", func, NULL);
+ g_signal_connect(*menuitem, "toggled", func, NULL);
}
int
if (group->is_scrolled)
{
group->frame = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_set_usize(GTK_WIDGET(group->frame), -2,
+ gtk_widget_set_size_request (GTK_WIDGET (group->frame), -2,
group->default_height);
group->scroll_outer_frame = GTK_FRAME(gtk_frame_new(groupname));
gtk_container_add(GTK_CONTAINER(group->scroll_outer_frame),
gtk_container_set_border_width(GTK_CONTAINER(group->frame), 10);
group->name = g_strdup(groupname);
- group->group_vbox = GTK_VBOX(gtk_vbox_new(FALSE, 10));
+ group->group_vbox = GTK_VBOX(gtk_box_new (GTK_ORIENTATION_VERTICAL, 10));
if (group->is_scrolled)
{
if (group->is_scrolled)
{
- gtk_box_pack_start_defaults(GTK_BOX(tab->main_box),
- GTK_WIDGET(group->scroll_outer_frame));
+ gtk_box_pack_start (GTK_BOX (tab->main_box),
+ GTK_WIDGET (group->scroll_outer_frame),
+ TRUE, TRUE, 0);
}
else
{
- gtk_box_pack_start_defaults(GTK_BOX(tab->main_box),
- GTK_WIDGET(group->frame));
+ gtk_box_pack_start (GTK_BOX (tab->main_box),
+ GTK_WIDGET (group->frame),
+ TRUE, TRUE, 0);
}
}
if (!found)
{
name_value = (NameValue *)g_new0(NameValue, 1);
- name_value->column1 = GTK_HBOX(gtk_hbox_new(FALSE, 10));
- name_value->column2 = GTK_HBOX(gtk_hbox_new(FALSE, 10));
- name_value->hbox = GTK_HBOX(gtk_hbox_new(FALSE, 5));
+ name_value->column1 = GTK_HBOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10));
+ name_value->column2 = GTK_HBOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10));
+ name_value->hbox = GTK_HBOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5));
name_value->label = GTK_LABEL(gtk_label_new(label));
name_value->string = gtk_label_new (NULL);
name_value->boolean = gtk_check_button_new ();
- name_value->text = gtk_entry_new_with_max_length (1000);
+ gtk_entry_buffer_set_max_length (gtk_entry_get_buffer (GTK_ENTRY (name_value->text)), 1000);
name_value->button = GTK_BUTTON(gtk_button_new ());
gtk_box_pack_end(GTK_BOX(name_value->column1),
break;
}
- gtk_box_pack_start_defaults(GTK_BOX(name_value->hbox),
- GTK_WIDGET(name_value->column1));
- gtk_box_pack_start_defaults(GTK_BOX(name_value->hbox),
- GTK_WIDGET(name_value->column2));
+ gtk_box_pack_start (GTK_BOX (name_value->hbox),
+ GTK_WIDGET (name_value->column1),
+ TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (name_value->hbox),
+ GTK_WIDGET (name_value->column2),
+ TRUE, TRUE, 0);
gtk_container_add(GTK_CONTAINER(group->group_vbox),
GTK_WIDGET(name_value->hbox));
group->name_value = g_list_append (group->name_value, name_value);
void _toggle_terminal(GtkCheckMenuItem *checkmenuitem,
gpointer user_data)
{
- if (checkmenuitem->active)
+ if (gtk_check_menu_item_get_active (checkmenuitem))
display_ascii = TRUE;
else
display_ascii = FALSE;
void _toggle_no_signals(GtkCheckMenuItem *checkmenuitem,
gpointer user_data)
{
- if (checkmenuitem->active)
+ if (gtk_check_menu_item_get_active (checkmenuitem))
no_signals = TRUE;
else
no_signals = FALSE;
void _toggle_magnifier(GtkCheckMenuItem *checkmenuitem,
gpointer user_data)
{
- if (checkmenuitem->active)
+ if (gtk_check_menu_item_get_active (checkmenuitem))
use_magnifier = TRUE;
else
use_magnifier = FALSE;
void _toggle_festival(GtkCheckMenuItem *checkmenuitem,
gpointer user_data)
{
- if (checkmenuitem->active)
+ if (gtk_check_menu_item_get_active (checkmenuitem))
use_festival = TRUE;
else
use_festival = FALSE;
void _toggle_festival_terse(GtkCheckMenuItem *checkmenuitem,
gpointer user_data)
{
- if (checkmenuitem->active)
+ if (gtk_check_menu_item_get_active (checkmenuitem))
{
say_role = FALSE;
say_accel = FALSE;
void _toggle_trackmouse(GtkCheckMenuItem *checkmenuitem,
gpointer user_data)
{
- if (checkmenuitem->active)
+ if (gtk_check_menu_item_get_active (checkmenuitem))
{
mouse_watcher_focus_id =
atk_add_global_event_listener(_mouse_watcher,
void _toggle_trackfocus(GtkCheckMenuItem *checkmenuitem,
gpointer user_data)
{
- if (checkmenuitem->active)
+ if (gtk_check_menu_item_get_active (checkmenuitem))
{
track_focus = TRUE;
focus_tracker_id = atk_add_focus_tracker (_print_accessible);