case GDK_WINDOW_EDGE_SOUTH_EAST:
sides = GTK_JUNCTION_CORNER_BOTTOMRIGHT;
break;
+ default:
+ g_assert_not_reached();
}
context = gtk_widget_get_style_context (area);
gtk_container_add (GTK_CONTAINER (window), main_vbox);
vbox =
- g_object_new (gtk_vbox_get_type (),
+ g_object_new (GTK_TYPE_BOX,
+ "orientation", GTK_ORIENTATION_VERTICAL,
"GtkBox::homogeneous", FALSE,
"GtkBox::spacing", 5,
"GtkContainer::border_width", 10,
gtk_widget_set_tooltip_text (toggle, "Toggle TipsQuery view.");
box3 =
- g_object_new (gtk_vbox_get_type (),
+ g_object_new (GTK_TYPE_BOX,
+ "orientation", GTK_ORIENTATION_VERTICAL,
"homogeneous", FALSE,
"spacing", 5,
"border_width", 5,
menuitem = gtk_image_menu_item_new_with_label ("Help");
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (screen, 4, 5, TRUE));
- gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE);
+ gtk_widget_set_hexpand (menuitem, TRUE);
+ gtk_widget_set_halign (menuitem, GTK_ALIGN_END);
gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
gtk_widget_show (menuitem);
{
int width, height;
GtkStyleContext *context;
- GdkRGBA *bg;
+ GdkRGBA bg;
width = gtk_widget_get_allocated_width (widget);
height = gtk_widget_get_allocated_height (widget);
cairo_fill (cr);
context = gtk_widget_get_style_context (widget);
- gtk_style_context_get (context, 0, "background-color", &bg, NULL);
- gdk_cairo_set_source_rgba (cr, bg);
- gdk_rgba_free (bg);
+ gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
+ gdk_cairo_set_source_rgba (cr, &bg);
cairo_rectangle (cr, width / 3, height / 3, width / 3, height / 3);
cairo_fill (cr);
gtk_container_add (GTK_CONTAINER (window), main_vbox);
vbox =
- g_object_new (gtk_vbox_get_type (),
+ g_object_new (GTK_TYPE_BOX,
+ "orientation", GTK_ORIENTATION_VERTICAL,
"GtkBox::homogeneous", FALSE,
"GtkBox::spacing", 5,
"GtkContainer::border_width", 10,
destroy_progress (GtkWidget *widget,
ProgressData **pdata)
{
- g_source_remove ((*pdata)->timer);
- (*pdata)->timer = 0;
+ if ((*pdata)->timer)
+ {
+ g_source_remove ((*pdata)->timer);
+ (*pdata)->timer = 0;
+ }
(*pdata)->window = NULL;
g_free (*pdata);
*pdata = NULL;
pdata->activity = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
}
+static void
+toggle_running (GtkWidget *widget, ProgressData *pdata)
+{
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+ {
+ if (pdata->timer == 0)
+ pdata->timer = g_timeout_add (100, (GSourceFunc)progress_timeout, pdata);
+ }
+ else
+ {
+ if (pdata->timer != 0)
+ {
+ g_source_remove (pdata->timer);
+ pdata->timer = 0;
+ }
+ }
+}
+
static void
entry_changed (GtkWidget *widget, ProgressData *pdata)
{
PANGO_ELLIPSIZE_MIDDLE);
gtk_container_add (GTK_CONTAINER (align), pdata->pbar);
- pdata->timer = g_timeout_add (100, (GSourceFunc)progress_timeout, pdata);
align = gtk_alignment_new (0.5, 0.5, 0, 0);
gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE, 5);
5, 5);
gtk_box_pack_start (GTK_BOX (hbox), pdata->omenu1, TRUE, TRUE, 0);
+ check = gtk_check_button_new_with_label ("Running");
+ g_signal_connect (check, "toggled",
+ G_CALLBACK (toggle_running),
+ pdata);
+ gtk_table_attach (GTK_TABLE (tab), check, 0, 2, 1, 2,
+ GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
+ 5, 5);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
+
check = gtk_check_button_new_with_label ("Show text");
g_signal_connect (check, "clicked",
G_CALLBACK (toggle_show_text),
pdata);
- gtk_table_attach (GTK_TABLE (tab), check, 0, 1, 1, 2,
+ gtk_table_attach (GTK_TABLE (tab), check, 0, 1, 2, 3,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
5, 5);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_table_attach (GTK_TABLE (tab), hbox, 1, 2, 1, 2,
+ gtk_table_attach (GTK_TABLE (tab), hbox, 1, 2, 2, 3,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
5, 5);
{
GtkWidget *widget = GTK_WIDGET (button);
GdkDevice *device;
- gint failure;
device = gtk_get_current_event_device ();
if (device == NULL)
data->cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
GDK_TARGET);
- failure = gdk_device_grab (device,
- gtk_widget_get_window (widget),
- GDK_OWNERSHIP_APPLICATION,
- TRUE,
- GDK_BUTTON_RELEASE_MASK,
- data->cursor,
- GDK_CURRENT_TIME);
+ gdk_device_grab (device,
+ gtk_widget_get_window (widget),
+ GDK_OWNERSHIP_APPLICATION,
+ TRUE,
+ GDK_BUTTON_RELEASE_MASK,
+ data->cursor,
+ GDK_CURRENT_TIME);
g_signal_connect (button, "event",
G_CALLBACK (snapshot_widget_event), data);
* rc file test
*/
-void
-reload_all_rc_files (void)
-{
- static GdkAtom atom_rcfiles = GDK_NONE;
-
- GdkEvent *send_event = gdk_event_new (GDK_CLIENT_EVENT);
- int i;
-
- if (!atom_rcfiles)
- atom_rcfiles = gdk_atom_intern("_GTK_READ_RCFILES", FALSE);
-
- for(i = 0; i < 5; i++)
- send_event->client.data.l[i] = 0;
- send_event->client.data_format = 32;
- send_event->client.message_type = atom_rcfiles;
- gdk_event_send_clientmessage_toall (send_event);
-
- gdk_event_free (send_event);
-}
-
void
create_rc_file (GtkWidget *widget)
{
gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_grab_default (button);
- button = gtk_button_new_with_label ("Reload All");
- g_signal_connect (button, "clicked",
- G_CALLBACK (reload_all_rc_files), NULL);
- gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
-
button = gtk_button_new_with_label ("Close");
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
static void
test_init (void)
{
- if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la",
- G_FILE_TEST_EXISTS))
- {
- g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/loaders.cache", TRUE);
- g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE);
- }
+ if (g_file_test ("../modules/input/immodules.cache", G_FILE_TEST_EXISTS))
+ g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE);
}
static char *
projects / ~andy / gtk / blobdiff