evolution r35584 - trunk/widgets/misc
- From: kmaraas svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r35584 - trunk/widgets/misc
- Date: Tue, 3 Jun 2008 18:35:03 +0000 (UTC)
Author: kmaraas
Date: Tue Jun 3 18:35:02 2008
New Revision: 35584
URL: http://svn.gnome.org/viewvc/evolution?rev=35584&view=rev
Log:
2008-06-03 Kjartan Maraas <kmaraas gnome org>
* e-cell-date-edit.c: (e_cell_date_edit_init):
* e-dateedit.c: (create_children):
* e-multi-config-dialog.c: (e_multi_config_dialog_init):
* e-unicode.h:
* test-calendar.c: (main):
* test-dateedit.c: (main):
* test-info-label.c: (main):
Migrate from gtk_window_set_policy() to gtk_window_set_resizable()
and clean up a bunch of coding style issues along the way.
Modified:
trunk/widgets/misc/ChangeLog
trunk/widgets/misc/e-cell-date-edit.c
trunk/widgets/misc/e-dateedit.c
trunk/widgets/misc/e-multi-config-dialog.c
trunk/widgets/misc/e-unicode.h
trunk/widgets/misc/test-calendar.c
trunk/widgets/misc/test-dateedit.c
trunk/widgets/misc/test-info-label.c
Modified: trunk/widgets/misc/e-cell-date-edit.c
==============================================================================
--- trunk/widgets/misc/e-cell-date-edit.c (original)
+++ trunk/widgets/misc/e-cell-date-edit.c Tue Jun 3 18:35:02 2008
@@ -233,8 +233,7 @@
gtk_window_set_type_hint (GTK_WINDOW (ecde->popup_window),
GDK_WINDOW_TYPE_HINT_COMBO);
- gtk_window_set_policy (GTK_WINDOW (ecde->popup_window),
- TRUE, TRUE, FALSE);
+ gtk_window_set_resizable (GTK_WINDOW (ecde->popup_window), TRUE);
frame = gtk_frame_new (NULL);
gtk_container_add (GTK_CONTAINER (ecde->popup_window), frame);
Modified: trunk/widgets/misc/e-dateedit.c
==============================================================================
--- trunk/widgets/misc/e-dateedit.c (original)
+++ trunk/widgets/misc/e-dateedit.c Tue Jun 3 18:35:02 2008
@@ -451,8 +451,7 @@
g_signal_connect (priv->cal_popup, "button_press_event",
G_CALLBACK (on_date_popup_button_press),
dedit);
- gtk_window_set_policy (GTK_WINDOW (priv->cal_popup),
- FALSE, FALSE, TRUE);
+ gtk_window_set_resizable (GTK_WINDOW (priv->cal_popup), TRUE);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
Modified: trunk/widgets/misc/e-multi-config-dialog.c
==============================================================================
--- trunk/widgets/misc/e-multi-config-dialog.c (original)
+++ trunk/widgets/misc/e-multi-config-dialog.c Tue Jun 3 18:35:02 2008
@@ -300,11 +300,7 @@
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (multi_config_dialog), GTK_RESPONSE_OK);
-
- gtk_window_set_policy (GTK_WINDOW (multi_config_dialog),
- FALSE /* allow_shrink */,
- TRUE /* allow_grow */,
- FALSE /* auto_shrink */);
+ gtk_window_set_resizable (GTK_WINDOW (multi_config_dialog), TRUE);
priv = g_new (EMultiConfigDialogPrivate, 1);
priv->pages = NULL;
Modified: trunk/widgets/misc/e-unicode.h
==============================================================================
--- trunk/widgets/misc/e-unicode.h (original)
+++ trunk/widgets/misc/e-unicode.h Tue Jun 3 18:35:02 2008
@@ -26,10 +26,7 @@
#include <sys/types.h>
#include <glib.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <libxml/tree.h>
#include <iconv.h>
Modified: trunk/widgets/misc/test-calendar.c
==============================================================================
--- trunk/widgets/misc/test-calendar.c (original)
+++ trunk/widgets/misc/test-calendar.c Tue Jun 3 18:35:02 2008
@@ -42,9 +42,11 @@
enum {
TARGET_SHORTCUT
};
+
static GtkTargetEntry target_table[] = {
{ "E-SHORTCUT", 0, TARGET_SHORTCUT }
};
+
static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
@@ -73,21 +75,21 @@
app = gnome_app_new ("Test", "Test");
gtk_window_set_default_size (GTK_WINDOW (app), 400, 400);
- gtk_window_set_policy (GTK_WINDOW (app), FALSE, TRUE, FALSE);
+ gtk_window_set_resizable (GTK_WINDOW (app), TRUE);
gtk_container_set_border_width (GTK_CONTAINER (app), 8);
- g_signal_connect((app), "delete_event",
- G_CALLBACK (delete_event_cb), NULL);
+ g_signal_connect (app, "delete_event",
+ G_CALLBACK (delete_event_cb), NULL);
cal = e_calendar_new ();
e_calendar_set_minimum_size (E_CALENDAR (cal), 1, 1);
calitem = E_CALENDAR (cal)->calitem;
gtk_widget_show (cal);
- g_signal_connect((calitem), "date_range_changed",
- G_CALLBACK (on_date_range_changed), NULL);
- g_signal_connect((calitem), "selection_changed",
- G_CALLBACK (on_selection_changed), NULL);
+ g_signal_connect (calitem, "date_range_changed",
+ G_CALLBACK (on_date_range_changed), NULL);
+ g_signal_connect (calitem, "selection_changed",
+ G_CALLBACK (on_selection_changed), NULL);
gtk_drag_dest_set (cal,
Modified: trunk/widgets/misc/test-dateedit.c
==============================================================================
--- trunk/widgets/misc/test-dateedit.c (original)
+++ trunk/widgets/misc/test-dateedit.c Tue Jun 3 18:35:02 2008
@@ -67,11 +67,11 @@
app = gnome_app_new ("Test", "Test");
gtk_window_set_default_size (GTK_WINDOW (app), 300, 200);
- gtk_window_set_policy (GTK_WINDOW (app), FALSE, TRUE, TRUE);
+ gtk_window_set_resizable (GTK_WINDOW (app), TRUE);
gtk_container_set_border_width (GTK_CONTAINER (app), 8);
- g_signal_connect((app), "delete_event",
- G_CALLBACK (delete_event_cb), app);
+ g_signal_connect (app, "delete_event",
+ G_CALLBACK (delete_event_cb), app);
table = gtk_table_new (3, 3, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 4);
@@ -81,17 +81,17 @@
/* EDateEdit 1. */
dedit = E_DATE_EDIT (e_date_edit_new ());
- gtk_table_attach (GTK_TABLE (table), (GtkWidget*) dedit,
+ gtk_table_attach (GTK_TABLE (table), GTK_WIDGET (dedit),
0, 1, 0, 1, GTK_FILL, GTK_EXPAND, 0, 0);
- gtk_widget_show ((GtkWidget*) (dedit));
+ gtk_widget_show (GTK_WIDGET (dedit));
#if 0
- g_signal_connect((dedit), "date_changed",
- G_CALLBACK (on_date_changed), "1");
- g_signal_connect((dedit), "time_changed",
- G_CALLBACK (on_time_changed), "1");
+ g_signal_connect (dedit, "date_changed",
+ G_CALLBACK (on_date_changed), "1");
+ g_signal_connect (dedit, "time_changed",
+ G_CALLBACK (on_time_changed), "1");
#else
- g_signal_connect((dedit), "changed",
+ g_signal_connect (dedit, "changed",
G_CALLBACK (on_changed), "1");
#endif
@@ -114,21 +114,21 @@
e_date_edit_set_show_time (dedit, FALSE);
#if 0
- g_signal_connect((dedit), "date_changed",
- G_CALLBACK (on_date_changed), "2");
- g_signal_connect((dedit), "time_changed",
- G_CALLBACK (on_time_changed), "2");
+ g_signal_connect (dedit, "date_changed",
+ G_CALLBACK (on_date_changed), "2");
+ g_signal_connect (dedit, "time_changed",
+ G_CALLBACK (on_time_changed), "2");
#else
- g_signal_connect((dedit), "changed",
- G_CALLBACK (on_changed), "2");
+ g_signal_connect (dedit, "changed",
+ G_CALLBACK (on_changed), "2");
#endif
button = gtk_button_new_with_label ("Print Date");
gtk_table_attach (GTK_TABLE (table), button,
1, 2, 1, 2, 0, 0, 0, 0);
gtk_widget_show (button);
- g_signal_connect((button), "clicked",
- G_CALLBACK (on_get_date_clicked), dedit);
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (on_get_date_clicked), dedit);
/* EDateEdit 3. */
dedit = E_DATE_EDIT (e_date_edit_new ());
@@ -142,29 +142,28 @@
e_date_edit_set_allow_no_date_set (dedit, TRUE);
#if 0
- g_signal_connect((dedit), "date_changed",
- G_CALLBACK (on_date_changed), "3");
- g_signal_connect((dedit), "time_changed",
- G_CALLBACK (on_time_changed), "3");
+ g_signal_connect (dedit, "date_changed",
+ G_CALLBACK (on_date_changed), "3");
+ g_signal_connect (dedit, "time_changed",
+ G_CALLBACK (on_time_changed), "3");
#else
- g_signal_connect((dedit), "changed",
- G_CALLBACK (on_changed), "3");
+ g_signal_connect (dedit, "changed",
+ G_CALLBACK (on_changed), "3");
#endif
button = gtk_button_new_with_label ("Print Date");
gtk_table_attach (GTK_TABLE (table), button,
1, 2, 2, 3, 0, 0, 0, 0);
gtk_widget_show (button);
- g_signal_connect((button), "clicked",
- G_CALLBACK (on_get_date_clicked), dedit);
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (on_get_date_clicked), dedit);
button = gtk_button_new_with_label ("Toggle 24-hour");
gtk_table_attach (GTK_TABLE (table), button,
2, 3, 2, 3, 0, 0, 0, 0);
gtk_widget_show (button);
- g_signal_connect((button), "clicked",
- G_CALLBACK (on_toggle_24_hour_clicked),
- dedit);
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (on_toggle_24_hour_clicked), dedit);
gtk_widget_show (app);
@@ -282,4 +281,3 @@
}
}
-
Modified: trunk/widgets/misc/test-info-label.c
==============================================================================
--- trunk/widgets/misc/test-info-label.c (original)
+++ trunk/widgets/misc/test-info-label.c Tue Jun 3 18:35:02 2008
@@ -58,9 +58,9 @@
app = gnome_app_new ("Test", "Test");
gtk_window_set_default_size (GTK_WINDOW (app), 400, 400);
- gtk_window_set_policy (GTK_WINDOW (app), FALSE, TRUE, FALSE);
+ gtk_window_set_resizable (GTK_WINDOW (app), TRUE);
- g_signal_connect((app), "delete_event", G_CALLBACK (delete_event_cb), NULL);
+ g_signal_connect (app, "delete_event", G_CALLBACK (delete_event_cb), NULL);
info_label = e_info_label_new ("stock_default-folder");
e_info_label_set_info ((EInfoLabel *) info_label, "Component Name", "An annoyingly long component message");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]