]> Pileus Git - ~andy/gtk/commitdiff
Adapt calls to g_{locale,filename}_{to,from}_utf8 to match current API.
authorTor Lillqvist <tml@iki.fi>
Sun, 7 Jan 2001 18:00:15 +0000 (18:00 +0000)
committerTor Lillqvist <tml@src.gnome.org>
Sun, 7 Jan 2001 18:00:15 +0000 (18:00 +0000)
2001-01-07  Tor Lillqvist  <tml@iki.fi>

* gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
to match current API.

* gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
environment variable is set, don't call g_error when on a
palettized (PseudoColor) display. Some people want to use GTK+
in 256-colour mode even though works only partially.

* gdk/gdk.def
* gtk/gtk.def
* gtk/makefile.mingw.in: Update.

12 files changed:
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8
gdk/gdk.def
gdk/win32/gdkvisual-win32.c
gdk/win32/gdkwindow-win32.c
gtk/gtk.def
gtk/makefile.mingw.in

index 95c94179bcf435f37f9e2409c8bf2c3b8f0c1f42..4bbd97d5184ab2e672b11760acf214e4bbbedd52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
+       gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+       to match current API.
+
+       * gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
+       environment variable is set, don't call g_error when on a
+       palettized (PseudoColor) display. Some people want to use GTK+ 
+       in 256-colour mode even though works only partially.
+
+       * gdk/gdk.def
+       * gtk/gtk.def
+       * gtk/makefile.mingw.in: Update.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtreeview.c: hack on this a bit
index 95c94179bcf435f37f9e2409c8bf2c3b8f0c1f42..4bbd97d5184ab2e672b11760acf214e4bbbedd52 100644 (file)
@@ -1,3 +1,18 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
+       gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+       to match current API.
+
+       * gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
+       environment variable is set, don't call g_error when on a
+       palettized (PseudoColor) display. Some people want to use GTK+ 
+       in 256-colour mode even though works only partially.
+
+       * gdk/gdk.def
+       * gtk/gtk.def
+       * gtk/makefile.mingw.in: Update.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtreeview.c: hack on this a bit
index 95c94179bcf435f37f9e2409c8bf2c3b8f0c1f42..4bbd97d5184ab2e672b11760acf214e4bbbedd52 100644 (file)
@@ -1,3 +1,18 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
+       gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+       to match current API.
+
+       * gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
+       environment variable is set, don't call g_error when on a
+       palettized (PseudoColor) display. Some people want to use GTK+ 
+       in 256-colour mode even though works only partially.
+
+       * gdk/gdk.def
+       * gtk/gtk.def
+       * gtk/makefile.mingw.in: Update.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtreeview.c: hack on this a bit
index 95c94179bcf435f37f9e2409c8bf2c3b8f0c1f42..4bbd97d5184ab2e672b11760acf214e4bbbedd52 100644 (file)
@@ -1,3 +1,18 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
+       gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+       to match current API.
+
+       * gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
+       environment variable is set, don't call g_error when on a
+       palettized (PseudoColor) display. Some people want to use GTK+ 
+       in 256-colour mode even though works only partially.
+
+       * gdk/gdk.def
+       * gtk/gtk.def
+       * gtk/makefile.mingw.in: Update.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtreeview.c: hack on this a bit
index 95c94179bcf435f37f9e2409c8bf2c3b8f0c1f42..4bbd97d5184ab2e672b11760acf214e4bbbedd52 100644 (file)
@@ -1,3 +1,18 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
+       gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+       to match current API.
+
+       * gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
+       environment variable is set, don't call g_error when on a
+       palettized (PseudoColor) display. Some people want to use GTK+ 
+       in 256-colour mode even though works only partially.
+
+       * gdk/gdk.def
+       * gtk/gtk.def
+       * gtk/makefile.mingw.in: Update.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtreeview.c: hack on this a bit
index 95c94179bcf435f37f9e2409c8bf2c3b8f0c1f42..4bbd97d5184ab2e672b11760acf214e4bbbedd52 100644 (file)
@@ -1,3 +1,18 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
+       gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+       to match current API.
+
+       * gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
+       environment variable is set, don't call g_error when on a
+       palettized (PseudoColor) display. Some people want to use GTK+ 
+       in 256-colour mode even though works only partially.
+
+       * gdk/gdk.def
+       * gtk/gtk.def
+       * gtk/makefile.mingw.in: Update.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtreeview.c: hack on this a bit
index 95c94179bcf435f37f9e2409c8bf2c3b8f0c1f42..4bbd97d5184ab2e672b11760acf214e4bbbedd52 100644 (file)
@@ -1,3 +1,18 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
+       gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+       to match current API.
+
+       * gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
+       environment variable is set, don't call g_error when on a
+       palettized (PseudoColor) display. Some people want to use GTK+ 
+       in 256-colour mode even though works only partially.
+
+       * gdk/gdk.def
+       * gtk/gtk.def
+       * gtk/makefile.mingw.in: Update.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtreeview.c: hack on this a bit
index b6ec2ea30a968e58084bc136d5e2b4a7475f872c..8032ca9126b642e4aa10673f2c3540774600ae46 100644 (file)
@@ -115,6 +115,7 @@ EXPORTS
        gdk_event_get
        gdk_event_get_axis
        gdk_event_get_graphics_expose
+       gdk_event_get_state
        gdk_event_get_time
        gdk_event_handler_set
        gdk_event_new
index e44087b13b3c1a9942d3c7a0c1a6d60cd3f1da05..e76f1476f1538f55d82b344a8a75b69f88e6d5d6 100644 (file)
@@ -65,8 +65,9 @@ gdk_visual_init (void)
 
   if (rastercaps & RC_PALETTE)
     {
-      g_error ("Palettized display (%d-colour) mode not supported on Windows.",
-              GetDeviceCaps (gdk_display_hdc, SIZEPALETTE));
+      if (!getenv ("GDK_WIN32_ENABLE_BROKEN_PSEUDOCOLOR_VISUAL"))
+       g_error ("Palettized display (%d-colour) mode not supported on Windows.",
+                GetDeviceCaps (gdk_display_hdc, SIZEPALETTE));
       system_visual->visual.type = GDK_VISUAL_PSEUDO_COLOR;
       numcolors = GetDeviceCaps (gdk_display_hdc, NUMCOLORS);
       sizepalette = GetDeviceCaps (gdk_display_hdc, SIZEPALETTE);
index 6b4e9e009d425a4cb212915c661e2b02fc767a8b..8a516965e1a940a5c457d5ae0a961899f03f0dd0 100644 (file)
@@ -163,6 +163,7 @@ gdk_window_impl_win32_get_colormap (GdkDrawable *drawable)
       drawable_impl->colormap == NULL)
     {
       drawable_impl->colormap = gdk_colormap_get_system ();
+      gdk_colormap_ref (drawable_impl->colormap);
     }
   
   return drawable_impl->colormap;
@@ -593,7 +594,7 @@ gdk_window_new (GdkWindow     *parent,
       height = impl->height;
     }
 
-  mbtitle = g_locale_from_utf8 (title, NULL);
+  mbtitle = g_locale_from_utf8 (title, -1, NULL, NULL, NULL);
   
 #ifdef WITHOUT_WM_CREATE
   draw_impl->handle = CreateWindowEx (dwExStyle,
@@ -1412,7 +1413,7 @@ gdk_window_set_title (GdkWindow   *window,
       /* As the title is in UTF-8 we must translate it
        * to the system codepage.
        */
-      mbtitle = g_locale_from_utf8 (title, NULL);
+      mbtitle = g_locale_from_utf8 (title, -1, NULL, NULL, NULL);
       if (!SetWindowText (GDK_WINDOW_HWND (window), mbtitle))
        WIN32_API_FAILED ("SetWindowText");
 
index 827a9a91d415f23e7a7eb8d24f21232467ebf510..415709bf897bc3a3b39121330a36a93ee6fcb7cc 100755 (executable)
@@ -5,9 +5,11 @@ EXPORTS
        GTK_TYPE_ARG_FLAGS
        GTK_TYPE_ARROW_TYPE
        GTK_TYPE_ATTACH_OPTIONS
+       GTK_TYPE_BUTTONS_TYPE
        GTK_TYPE_BUTTON_ACTION
        GTK_TYPE_BUTTON_BOX_STYLE
        GTK_TYPE_CALENDAR_DISPLAY_OPTIONS
+       GTK_TYPE_CELL_RENDERER_STATE
        GTK_TYPE_CELL_TYPE
        GTK_TYPE_CLIST_DRAG_POS
        GTK_TYPE_CORNER_TYPE
@@ -19,6 +21,7 @@ EXPORTS
        GTK_TYPE_DEBUG_FLAG
        GTK_TYPE_DELETE_TYPE
        GTK_TYPE_DEST_DEFAULTS
+       GTK_TYPE_DIALOG_FLAGS
        GTK_TYPE_DIRECTION_TYPE
        GTK_TYPE_FUNDAMENTAL_TYPE
        GTK_TYPE_GDK_AXIS_USE
@@ -42,6 +45,7 @@ EXPORTS
        GTK_TYPE_GDK_FUNCTION
        GTK_TYPE_GDK_GC_VALUES_MASK
        GTK_TYPE_GDK_GRAB_STATUS
+       GTK_TYPE_GDK_GRAVITY
        GTK_TYPE_GDK_IC_ATTRIBUTES_TYPE
        GTK_TYPE_GDK_IMAGE_TYPE
        GTK_TYPE_GDK_IM_STYLE
@@ -76,12 +80,15 @@ EXPORTS
        GTK_TYPE_MATCH_TYPE
        GTK_TYPE_MENU_DIRECTION_TYPE
        GTK_TYPE_MENU_FACTORY_TYPE
+       GTK_TYPE_MESSAGE_TYPE
        GTK_TYPE_METRIC_TYPE
        GTK_TYPE_MOVEMENT_STEP
        GTK_TYPE_OBJECT_FLAGS
        GTK_TYPE_ORIENTATION
        GTK_TYPE_PACKER_OPTIONS
        GTK_TYPE_PACK_TYPE
+       GTK_TYPE_PANGO_FONT_DESCRIPTION
+       GTK_TYPE_PANGO_TAB_ARRAY
        GTK_TYPE_PATH_PRIORITY_TYPE
        GTK_TYPE_PATH_TYPE
        GTK_TYPE_POLICY_TYPE
@@ -94,6 +101,7 @@ EXPORTS
        GTK_TYPE_RC_TOKEN_TYPE
        GTK_TYPE_RELIEF_STYLE
        GTK_TYPE_RESIZE_MODE
+       GTK_TYPE_RESPONSE_TYPE
        GTK_TYPE_SCROLL_TYPE
        GTK_TYPE_SELECTION_DATA
        GTK_TYPE_SELECTION_MODE
@@ -107,11 +115,18 @@ EXPORTS
        GTK_TYPE_SUBMENU_DIRECTION
        GTK_TYPE_SUBMENU_PLACEMENT
        GTK_TYPE_TARGET_FLAGS
+       GTK_TYPE_TEXT_ATTRIBUTES
        GTK_TYPE_TEXT_DIRECTION
+       GTK_TYPE_TEXT_ITER
        GTK_TYPE_TEXT_WINDOW_TYPE
        GTK_TYPE_TOOLBAR_CHILD_TYPE
        GTK_TYPE_TOOLBAR_SPACE_STYLE
        GTK_TYPE_TOOLBAR_STYLE
+       GTK_TYPE_TREE_ITER
+       GTK_TYPE_TREE_MODEL_FLAGS
+       GTK_TYPE_TREE_PATH
+       GTK_TYPE_TREE_SELECTION_MODE
+       GTK_TYPE_TREE_VIEW_COLUMN_SIZING
        GTK_TYPE_TREE_VIEW_MODE
        GTK_TYPE_TROUGH_TYPE
        GTK_TYPE_UPDATE_TYPE
@@ -235,6 +250,8 @@ EXPORTS
        gtk_cell_renderer_text_new
        gtk_cell_renderer_text_pixbuf_get_type
        gtk_cell_renderer_text_pixbuf_new
+       gtk_cell_renderer_toggle_get_active
+       gtk_cell_renderer_toggle_set_active
        gtk_check_button_get_type
        gtk_check_button_new
        gtk_check_button_new_with_label
@@ -474,7 +491,6 @@ EXPORTS
        gtk_draw_box
        gtk_draw_diamond
        gtk_draw_hline
-       gtk_draw_oval
        gtk_draw_polygon
        gtk_draw_shadow
        gtk_draw_string
@@ -886,17 +902,15 @@ EXPORTS
        gtk_paint_box
        gtk_paint_box_gap
        gtk_paint_check
-       gtk_paint_cross
        gtk_paint_diamond
        gtk_paint_extension
        gtk_paint_flat_box
        gtk_paint_focus
        gtk_paint_handle
        gtk_paint_hline
+       gtk_paint_layout
        gtk_paint_option
-       gtk_paint_oval
        gtk_paint_polygon
-       gtk_paint_ramp
        gtk_paint_shadow
        gtk_paint_shadow_gap
        gtk_paint_slider
@@ -1298,17 +1312,108 @@ EXPORTS
        gtk_tree_item_remove_subtree
        gtk_tree_item_select
        gtk_tree_item_set_subtree
+       gtk_tree_model_simple_changed
+       gtk_tree_model_simple_child_toggled
+       gtk_tree_model_simple_get_type
+       gtk_tree_model_simple_inserted
+       gtk_tree_model_simple_new
+       gtk_tree_model_sort_convert_path
+       gtk_tree_model_sort_get_type
+       gtk_tree_model_sort_new
+       gtk_tree_model_sort_new_with_model
+       gtk_tree_model_sort_set_model
        gtk_tree_new
        gtk_tree_prepend
        gtk_tree_remove_item
        gtk_tree_remove_items
        gtk_tree_select_child
        gtk_tree_select_item
+       gtk_tree_selection_get_selected
+       gtk_tree_selection_get_tree_view
+       gtk_tree_selection_get_type
+       gtk_tree_selection_get_user_data
+       gtk_tree_selection_select_all
+       gtk_tree_selection_select_iter
+       gtk_tree_selection_select_path
+       gtk_tree_selection_select_range
+       gtk_tree_selection_selected_foreach
+       gtk_tree_selection_set_mode
+       gtk_tree_selection_set_select_function
+       gtk_tree_selection_unselect_all
+       gtk_tree_selection_unselect_iter
+       gtk_tree_selection_unselect_path
        gtk_tree_set_selection_mode
        gtk_tree_set_view_lines
        gtk_tree_set_view_mode
+       gtk_tree_store_append
+       gtk_tree_store_get
+       gtk_tree_store_get_root_iter
+       gtk_tree_store_get_type
+       gtk_tree_store_getv
+       gtk_tree_store_insert
+       gtk_tree_store_insert_after
+       gtk_tree_store_insert_before
+       gtk_tree_store_is_ancestor
+       gtk_tree_store_iter_depth
+       gtk_tree_store_new
+       gtk_tree_store_new_with_types
+       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_setv
        gtk_tree_unselect_child
        gtk_tree_unselect_item
+       gtk_tree_view_append_column
+       gtk_tree_view_collapse_all
+       gtk_tree_view_collapse_row
+       gtk_tree_view_column_add_attribute
+       gtk_tree_view_column_clicked
+       gtk_tree_view_column_get_col_type
+       gtk_tree_view_column_get_max_width
+       gtk_tree_view_column_get_min_width
+       gtk_tree_view_column_get_size
+       gtk_tree_view_column_get_title
+       gtk_tree_view_column_get_type
+       gtk_tree_view_column_get_visible
+       gtk_tree_view_column_get_widget
+       gtk_tree_view_column_new
+       gtk_tree_view_column_new_with_attributes
+       gtk_tree_view_column_set_attributes
+       gtk_tree_view_column_set_cell_data
+       gtk_tree_view_column_set_cell_renderer
+       gtk_tree_view_column_set_header_clickable
+       gtk_tree_view_column_set_justification
+       gtk_tree_view_column_set_max_width
+       gtk_tree_view_column_set_min_width
+       gtk_tree_view_column_set_sizing
+       gtk_tree_view_column_set_title
+       gtk_tree_view_column_set_visible
+       gtk_tree_view_column_set_widget
+       gtk_tree_view_column_set_width
+       gtk_tree_view_columns_autosize
+       gtk_tree_view_expand_all
+       gtk_tree_view_expand_row
+       gtk_tree_view_get_column
+       gtk_tree_view_get_hadjustment
+       gtk_tree_view_get_headers_visible
+       gtk_tree_view_get_model
+       gtk_tree_view_get_path_at_pos
+       gtk_tree_view_get_selection
+       gtk_tree_view_get_type
+       gtk_tree_view_get_vadjustment
+       gtk_tree_view_insert_column
+       gtk_tree_view_move_to
+       gtk_tree_view_new
+       gtk_tree_view_new_with_model
+       gtk_tree_view_remove_column
+       gtk_tree_view_set_hadjustment
+       gtk_tree_view_set_headers_clickable
+       gtk_tree_view_set_headers_visible
+       gtk_tree_view_set_model
+       gtk_tree_view_set_vadjustment
        gtk_true
        gtk_type_class
        gtk_type_enum_find_value
index eab16f7aace1ba1e7b384e4b20212a7e69675833..3ad907f38d526bacb52647e16b7c61ca652454e3 100644 (file)
@@ -38,155 +38,163 @@ DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -DGTK_
 
 GLIB_GENMARSHAL = $(GLIB)/gobject/glib-genmarshal.exe
 
-all :                                          \
-       ../config.h                             \
-       generated                               \
-       gtk-win32-$(GTK_VER).dll                \
-       testcalendar.exe                        \
-       testdnd.exe                             \
-       testgtk.exe                             \
-       testinput.exe                           \
-       testrgb.exe                             \
-       testselection.exe                       \
-       testtext.exe                            \
-       testtextbuffer.exe                      \
+all :                          \
+       ../config.h             \
+       generated               \
+       gtk-win32-$(GTK_VER).dll\
+       testcalendar.exe        \
+       testdnd.exe             \
+       testgtk.exe             \
+       testinput.exe           \
+       testrgb.exe             \
+       testselection.exe       \
+       testtext.exe            \
+       testtextbuffer.exe      \
        simple.exe
 
-gtk_OBJECTS =                                  \
-       fnmatch.o                               \
-       gdk-pixbuf-loader.o                     \
-       gtkaccelgroup.o                         \
-       gtkaccellabel.o                         \
-       gtkadjustment.o                         \
-       gtkalignment.o                          \
-       gtkarg.o                                \
-       gtkarrow.o                              \
-       gtkaspectframe.o                        \
-       gtkbin.o                                \
-       gtkbindings.o                           \
-       gtkbbox.o                               \
-       gtkbox.o                                \
-       gtkbutton.o                             \
-       gtkcalendar.o                           \
-       gtkcellrenderer.o                       \
-       gtkcellrenderertext.o                   \
-       gtkcellrenderertextpixbuf.o             \
-       gtkcellrenderertoggle.o                 \
-       gtkcellrendererpixbuf.o                 \
-       gtkcheckbutton.o                        \
-       gtkcheckmenuitem.o                      \
-       gtkclipboard.o                          \
-       gtkclist.o                              \
-       gtkcolorsel.o                           \
-       gtkcolorseldialog.o                     \
-       gtkcombo.o                              \
-       gtkcontainer.o                          \
-       gtkctree.o                              \
-       gtkcurve.o                              \
-       gtkdata.o                               \
-       gtkdialog.o                             \
-       gtkdnd.o                                \
-       gtkdrawingarea.o                        \
-       gtkeditable.o                           \
-       gtkentry.o                              \
-       gtkeventbox.o                           \
-       gtkfilesel.o                            \
-       gtkfixed.o                              \
-       gtkfontsel.o                            \
-       gtkframe.o                              \
-       gtkgamma.o                              \
-       gtkgc.o                                 \
-       gtkhandlebox.o                          \
-       gtkhbbox.o                              \
-       gtkhbox.o                               \
-       gtkhpaned.o                             \
-       gtkhruler.o                             \
-       gtkhscale.o                             \
-       gtkhscrollbar.o                         \
-       gtkhseparator.o                         \
-       gtkhsv.o                                \
-       gtkiconfactory.o                        \
-       gtkimage.o                              \
-       gtkimcontext.o                          \
-       gtkimcontextsimple.o                    \
-       gtkimmodule.o                           \
-       gtkimmulticontext.o                     \
-       gtkinputdialog.o                        \
-       gtkinvisible.o                          \
-       gtkitem.o                               \
-       gtkitemfactory.o                        \
-       gtklabel.o                              \
-       gtklayout.o                             \
-       gtklist.o                               \
-       gtklistitem.o                           \
-       gtkmain.o                               \
-       gtkmenu.o                               \
-       gtkmenubar.o                            \
-       gtkmenufactory.o                        \
-       gtkmenuitem.o                           \
-       gtkmenushell.o                          \
-       gtkmessagedialog.o                      \
-       gtkmisc.o                               \
-       gtknotebook.o                           \
-       gtkobject.o                             \
-       gtkoldeditable.o                        \
-       gtkoptionmenu.o                         \
-       gtkpacker.o                             \
-       gtkpaned.o                              \
-       gtkpixmap.o                             \
-       gtkplug.o                               \
-       gtkpreview.o                            \
-       gtkprogress.o                           \
-       gtkprogressbar.o                        \
-       gtkradiobutton.o                        \
-       gtkradiomenuitem.o                      \
-       gtkrange.o                              \
-       gtkrc.o                                 \
-       gtkruler.o                              \
-       gtkscale.o                              \
-       gtkscrollbar.o                          \
-       gtkscrolledwindow.o                     \
-       gtkselection.o                          \
-       gtkseparator.o                          \
-       gtksignal.o                             \
-       gtksocket.o                             \
-       gtkspinbutton.o                         \
-       gtkstyle.o                              \
-       gtkstatusbar.o                          \
-       gtkstock.o                              \
-       gtktable.o                              \
-       gtktearoffmenuitem.o                    \
-       gtktext.o                               \
-       gtktextbtree.o                          \
-       gtktextbuffer.o                         \
-       gtktextchild.o                          \
-       gtktextdisplay.o                        \
-       gtktextiter.o                           \
-       gtktextlayout.o                         \
-       gtktextmark.o                           \
-       gtktextsegment.o                        \
-       gtktexttag.o                            \
-       gtktexttagtable.o                       \
-       gtktexttypes.o                          \
-       gtktextview.o                           \
-       gtkthemes.o                             \
-       gtktipsquery.o                          \
-       gtktogglebutton.o                       \
-       gtktoolbar.o                            \
-       gtktooltips.o                           \
-       gtktree.o                               \
-       gtktreeitem.o                           \
-       gtktreemodel.o                          \
-       gtktypeutils.o                          \
-       gtkvbbox.o                              \
-       gtkvbox.o                               \
-       gtkviewport.o                           \
-       gtkvpaned.o                             \
-       gtkvruler.o                             \
-       gtkvscale.o                             \
-       gtkvscrollbar.o                         \
-       gtkvseparator.o                         \
-       gtkwidget.o                             \
+gtk_OBJECTS =                  \
+       fnmatch.o               \
+       gdk-pixbuf-loader.o     \
+       gtkaccelgroup.o         \
+       gtkaccellabel.o         \
+       gtkadjustment.o         \
+       gtkalignment.o          \
+       gtkarg.o                \
+       gtkarrow.o              \
+       gtkaspectframe.o        \
+       gtkbin.o                \
+       gtkbindings.o           \
+       gtkbbox.o               \
+       gtkbox.o                \
+       gtkbutton.o             \
+       gtkcalendar.o           \
+       gtkcellrenderer.o       \
+       gtkcellrenderertext.o   \
+       gtkcellrenderertextpixbuf.o     \
+       gtkcellrenderertoggle.o \
+       gtkcellrendererpixbuf.o \
+       gtkcheckbutton.o        \
+       gtkcheckmenuitem.o      \
+       gtkclipboard.o          \
+       gtkclist.o              \
+       gtkcolorsel.o           \
+       gtkcolorseldialog.o     \
+       gtkcombo.o              \
+       gtkcontainer.o          \
+       gtkctree.o              \
+       gtkcurve.o              \
+       gtkdata.o               \
+       gtkdialog.o             \
+       gtkdnd.o                \
+       gtkdrawingarea.o        \
+       gtkeditable.o           \
+       gtkentry.o              \
+       gtkeventbox.o           \
+       gtkfilesel.o            \
+       gtkfixed.o              \
+       gtkfontsel.o            \
+       gtkframe.o              \
+       gtkgamma.o              \
+       gtkgc.o                 \
+       gtkhandlebox.o          \
+       gtkhbbox.o              \
+       gtkhbox.o               \
+       gtkhpaned.o             \
+       gtkhruler.o             \
+       gtkhscale.o             \
+       gtkhscrollbar.o         \
+       gtkhseparator.o         \
+       gtkhsv.o                \
+       gtkiconfactory.o        \
+       gtkimage.o              \
+       gtkimcontext.o          \
+       gtkimcontextsimple.o    \
+       gtkimmodule.o           \
+       gtkimmulticontext.o     \
+       gtkinputdialog.o        \
+       gtkinvisible.o          \
+       gtkitem.o               \
+       gtkitemfactory.o        \
+       gtklabel.o              \
+       gtklayout.o             \
+       gtklist.o               \
+       gtklistitem.o           \
+       gtkmain.o               \
+       gtkmenu.o               \
+       gtkmenubar.o            \
+       gtkmenufactory.o        \
+       gtkmenuitem.o           \
+       gtkmenushell.o          \
+       gtkmessagedialog.o      \
+       gtkmisc.o               \
+       gtknotebook.o           \
+       gtkobject.o             \
+       gtkoldeditable.o        \
+       gtkoptionmenu.o         \
+       gtkpacker.o             \
+       gtkpaned.o              \
+       gtkpixmap.o             \
+       gtkplug.o               \
+       gtkpreview.o            \
+       gtkprogress.o           \
+       gtkprogressbar.o        \
+       gtkradiobutton.o        \
+       gtkradiomenuitem.o      \
+       gtkrange.o              \
+       gtkrbtree.o             \
+       gtkrc.o                 \
+       gtkruler.o              \
+       gtkscale.o              \
+       gtkscrollbar.o          \
+       gtkscrolledwindow.o     \
+       gtkselection.o          \
+       gtkseparator.o          \
+       gtksignal.o             \
+       gtksocket.o             \
+       gtkspinbutton.o         \
+       gtkstyle.o              \
+       gtkstatusbar.o          \
+       gtkstock.o              \
+       gtktable.o              \
+       gtktearoffmenuitem.o    \
+       gtktext.o               \
+       gtktextbtree.o          \
+       gtktextbuffer.o         \
+       gtktextchild.o          \
+       gtktextdisplay.o        \
+       gtktextiter.o           \
+       gtktextlayout.o         \
+       gtktextmark.o           \
+       gtktextsegment.o        \
+       gtktexttag.o            \
+       gtktexttagtable.o       \
+       gtktexttypes.o          \
+       gtktextview.o           \
+       gtkthemes.o             \
+       gtktipsquery.o          \
+       gtktogglebutton.o       \
+       gtktoolbar.o            \
+       gtktooltips.o           \
+       gtktree.o               \
+       gtktreeitem.o           \
+       gtktreedatalist.o       \
+       gtktreemodel.o          \
+       gtktreemodelsimple.o    \
+       gtktreemodelsort.o      \
+       gtktreeselection.o      \
+       gtktreestore.o          \
+       gtktreeview.o           \
+       gtktreeviewcolumn.o     \
+       gtktypeutils.o          \
+       gtkvbbox.o              \
+       gtkvbox.o               \
+       gtkviewport.o           \
+       gtkvpaned.o             \
+       gtkvruler.o             \
+       gtkvscale.o             \
+       gtkvscrollbar.o         \
+       gtkvseparator.o         \
+       gtkwidget.o             \
        gtkwindow.o
 
 # Source headers which are non-autogenerated headers
@@ -267,7 +275,6 @@ gtk_public_h_sources =              \
        gtkmenushell.h          \
        gtkmessagedialog.h      \
        gtkmisc.h               \
-       gtkmodelsimple.h        \
        gtknotebook.h           \
        gtkoldeditable.h        \
        gtkobject.h             \
@@ -316,6 +323,7 @@ gtk_public_h_sources =              \
        gtktree.h               \
        gtktreeitem.h           \
        gtktreemodel.h          \
+       gtktreemodelsimple.h    \
        gtktreemodelsort.h      \
        gtktreeselection.h      \
        gtktreestore.h          \