summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rwxr-xr-xgtk/gtk.def24
-rw-r--r--gtk/gtkfilesel.c3
-rw-r--r--gtk/gtktreeitem.c4
-rw-r--r--gtk/makefile.msc.in15
4 files changed, 30 insertions, 16 deletions
diff --git a/gtk/gtk.def b/gtk/gtk.def
index d177b68434..f52bdcb7a0 100755
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -220,9 +220,9 @@ EXPORTS
gtk_button_get_type
gtk_button_leave
gtk_button_new
- gtk_button_new_accel
- gtk_button_new_stock
+ gtk_button_new_from_stock
gtk_button_new_with_label
+ gtk_button_new_with_mnemonic
gtk_button_pressed
gtk_button_released
gtk_button_set_relief
@@ -250,6 +250,7 @@ EXPORTS
gtk_check_button_get_type
gtk_check_button_new
gtk_check_button_new_with_label
+ gtk_check_button_new_with_mnemonic
gtk_check_menu_item_get_type
gtk_check_menu_item_new
gtk_check_menu_item_new_with_label
@@ -376,6 +377,7 @@ EXPORTS
gtk_container_remove
gtk_container_resize_children
gtk_container_set_border_width
+ gtk_container_set_focus_chain
gtk_container_set_focus_child
gtk_container_set_focus_hadjustment
gtk_container_set_focus_vadjustment
@@ -608,6 +610,7 @@ EXPORTS
gtk_image_get_storage_type
gtk_image_get_type
gtk_image_menu_item_new
+ gtk_image_menu_item_new_from_stock
gtk_image_new
gtk_image_new_from_file
gtk_image_new_from_icon_set
@@ -671,13 +674,15 @@ EXPORTS
gtk_key_snooper_install
gtk_key_snooper_remove
gtk_label_get
+ gtk_label_get_mnemonic_keyval
gtk_label_get_type
gtk_label_new
+ gtk_label_new_with_mnemonic
gtk_label_parse_uline
gtk_label_set_justify
gtk_label_set_line_wrap
gtk_label_set_markup
- gtk_label_set_markup_with_accel
+ gtk_label_set_markup_with_mnemonic
gtk_label_set_pattern
gtk_label_set_selectable
gtk_label_set_selectable
@@ -736,7 +741,6 @@ EXPORTS
gtk_marshal_BOOLEAN__OBJECT_STRING_STRING_BOXED
gtk_marshal_BOOLEAN__VOID
gtk_marshal_ENUM__ENUM
- gtk_marshal_INT__OBJECT_BOXED_BOXED
gtk_marshal_INT__POINTER
gtk_marshal_VOID__BOOLEAN
gtk_marshal_VOID__BOXED
@@ -775,7 +779,6 @@ EXPORTS
gtk_menu_bar_prepend
gtk_menu_bar_set_shadow_type
gtk_menu_detach
- gtk_menu_ensure_uline_accel_group
gtk_menu_factory_add_entries
gtk_menu_factory_add_subfactory
gtk_menu_factory_destroy
@@ -788,7 +791,6 @@ EXPORTS
gtk_menu_get_active
gtk_menu_get_attach_widget
gtk_menu_get_type
- gtk_menu_get_uline_accel_group
gtk_menu_item_activate
gtk_menu_item_configure
gtk_menu_item_deselect
@@ -1094,6 +1096,7 @@ EXPORTS
gtk_spin_button_get_value_as_float
gtk_spin_button_get_value_as_int
gtk_spin_button_new
+ gtk_spin_button_new_with_range
gtk_spin_button_set_adjustment
gtk_spin_button_set_digits
gtk_spin_button_set_numeric
@@ -1280,6 +1283,7 @@ EXPORTS
gtk_toolbar_insert_element
gtk_toolbar_insert_item
gtk_toolbar_insert_space
+ gtk_toolbar_insert_stock
gtk_toolbar_insert_widget
gtk_toolbar_new
gtk_toolbar_prepend_element
@@ -1287,6 +1291,7 @@ EXPORTS
gtk_toolbar_prepend_space
gtk_toolbar_prepend_widget
gtk_toolbar_set_button_relief
+ gtk_toolbar_set_icon_size
gtk_toolbar_set_orientation
gtk_toolbar_set_space_size
gtk_toolbar_set_space_style
@@ -1360,7 +1365,6 @@ EXPORTS
gtk_tree_store_prepend
gtk_tree_store_remove
gtk_tree_store_set
- gtk_tree_store_set_cell
gtk_tree_store_set_column_type
gtk_tree_store_set_n_columns
gtk_tree_store_set_valist
@@ -1553,7 +1557,7 @@ EXPORTS
gtk_window_add_accel_group
gtk_window_add_embedded_xid
gtk_window_deiconify
- gtk_window_get_default_accel_group
+ gtk_window_get_location
gtk_window_get_type
gtk_window_iconify
gtk_window_maximize
@@ -1566,12 +1570,16 @@ EXPORTS
gtk_window_set_default_size
gtk_window_set_focus
gtk_window_set_geometry_hints
+ gtk_window_set_gravity
+ gtk_window_set_location
gtk_window_set_modal
gtk_window_set_policy
gtk_window_set_position
+ gtk_window_set_size
gtk_window_set_title
gtk_window_set_transient_for
gtk_window_set_wmclass
gtk_window_stick
gtk_window_unmaximize
gtk_window_unstick
+
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 3112cde6e1..23a43a2b85 100644
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -2417,7 +2417,6 @@ open_new_dir (gchar *dir_name,
g_warning (_("The filename %s couldn't be converted to UTF-8. Try setting the environment variable G_BROKEN_FILENAMES."), dirent_ptr->d_name);
continue;
}
- n_entries++;
g_string_assign (path, sys_dir_name);
if (path->str[path->len-1] != G_DIR_SEPARATOR)
@@ -2438,6 +2437,8 @@ open_new_dir (gchar *dir_name,
}
else
sent->entries[n_entries].is_dir = 1;
+
+ n_entries++;
}
sent->entry_count = n_entries;
diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index 15c3e2a2fd..801858a4ca 100644
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -177,8 +177,8 @@ gtk_tree_item_subtree_button_click (GtkWidget *widget)
{
GtkTreeItem* item;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_EVENT_BOX (widget));
+ g_return_val_if_fail (widget != NULL, FALSE);
+ g_return_val_if_fail (GTK_IS_EVENT_BOX (widget), FALSE);
item = (GtkTreeItem*) gtk_object_get_user_data (GTK_OBJECT (widget));
if (!GTK_WIDGET_IS_SENSITIVE (item))
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index fea06f7600..a762dd52b2 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -4,7 +4,7 @@
## There is no install target, you have to decide where and
## how to install for yourself.
-TOP = ../..
+TOP = ..\..
!INCLUDE $(TOP)/build/win32/make.msc
################################################################
@@ -116,6 +116,7 @@ gtk_OBJECTS = \
gtklayout.obj \
gtklist.obj \
gtklistitem.obj \
+ gtkliststore.obj \
gtkmain.obj \
gtkmenu.obj \
gtkmenubar.obj \
@@ -147,6 +148,7 @@ gtk_OBJECTS = \
gtkselection.obj \
gtkseparator.obj \
gtkseparatormenuitem.obj \
+ gtksettings.obj \
gtksignal.obj \
gtksocket.obj \
gtkspinbutton.obj \
@@ -178,9 +180,10 @@ gtk_OBJECTS = \
gtktreednd.obj \
gtktreeitem.obj \
gtktreemodel.obj \
- gtktreemodelsimple.obj \
+# gtktreemodelsimple.obj \
gtktreemodelsort.obj \
gtktreeselection.obj \
+ gtktreesortable.obj \
gtktreestore.obj \
gtktreeview.obj \
gtktreeviewcolumn.obj \
@@ -351,7 +354,6 @@ gdk_headers = \
..\gdk\gdkevents.h \
..\gdk\gdkfont.h \
..\gdk\gdkgc.h \
- ..\gdk\gdkim.h \
..\gdk\gdkimage.h \
..\gdk\gdkinput.h \
..\gdk\gdkpixmap.h \
@@ -396,10 +398,13 @@ gtktypebuiltins_evals.c: makeenums.pl gtk.defs
$(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) >gtktypebuiltins_evals.c
gtkmarshal.h : gtkmarshal.list
- glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --header >gtkmarshal.h
+ $(GLIB)\gobject\glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --header >gtkmarshal.h
gtkmarshal.c : gtkmarshal.list
- glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
+ $(GLIB)\gobject\glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
+
+gtksignal.obj : gtksignal.c gtkmarshal.c gtkmarshal.h
+ $(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" gtksignal.c
#
# Linking:
View Lorry Controller Status