updated added all the new tests

2003-11-15  Hans Breuer  <hans@breuer.org>

	* gdk/makefile.msc gdk/gdk.def
            gtk/gtk.def gtk/makefile.msc.in : updated
	* tests/makefile.msc : added all the new tests

	* gtk/gtkfilefilter.c(finalize) : initialize filter
	from object not from itself

	* gtk/gtkfilesystemwin32.[hc] : copied from gtkfilesystemunix.[hc]
	modified as less as posible to have aworking implementation
	on win32. There maybe the desire to merge the unchanged pats into
	a common base class.
	Also implemented a simple glib based bookmark handling, which
	is currently missing in gtkfilesystemunix.[hc] but can be copied
	over there.
	* gtk/gtkfilechooserwidget.c : conditional include gtkfilesystemwin32.h

	* gdk/win32/gdkwindow-win32.c : implement
	gdk_window_set_keep_above() and gdk_window_set_keep_below()

	* tests/testmerge.c : don't include unistd.h unconditionally,
	#define STDOUT_FILENO if it isn't defined

	* tests/testfilechooser.c : make it compile on win32
This commit is contained in:
Hans Breuer 2003-11-15 20:35:55 +00:00 committed by Hans Breuer
parent 9e831c8b8e
commit 947b32b7dc
16 changed files with 1567 additions and 27 deletions

View File

@ -1,3 +1,29 @@
2003-11-15 Hans Breuer <hans@breuer.org>
* gdk/makefile.msc gdk/gdk.def
gtk/gtk.def gtk/makefile.msc.in : updated
* tests/makefile.msc : added all the new tests
* gtk/gtkfilefilter.c(finalize) : initialize filter
from object not from itself
* gtk/gtkfilesystemwin32.[hc] : copied from gtkfilesystemunix.[hc]
modified as less as posible to have aworking implementation
on win32. There maybe the desire to merge the unchanged pats into
a common base class.
Also implemented a simple glib based bookmark handling, which
is currently missing in gtkfilesystemunix.[hc] but can be copied
over there.
* gtk/gtkfilechooserwidget.c : conditional include gtkfilesystemwin32.h
* gdk/win32/gdkwindow-win32.c : implement
gdk_window_set_keep_above() and gdk_window_set_keep_below()
* tests/testmerge.c : don't include unistd.h unconditionally,
#define STDOUT_FILENO if it isn't defined
* tests/testfilechooser.c : make it compile on win32
2003-11-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is

View File

@ -1,3 +1,29 @@
2003-11-15 Hans Breuer <hans@breuer.org>
* gdk/makefile.msc gdk/gdk.def
gtk/gtk.def gtk/makefile.msc.in : updated
* tests/makefile.msc : added all the new tests
* gtk/gtkfilefilter.c(finalize) : initialize filter
from object not from itself
* gtk/gtkfilesystemwin32.[hc] : copied from gtkfilesystemunix.[hc]
modified as less as posible to have aworking implementation
on win32. There maybe the desire to merge the unchanged pats into
a common base class.
Also implemented a simple glib based bookmark handling, which
is currently missing in gtkfilesystemunix.[hc] but can be copied
over there.
* gtk/gtkfilechooserwidget.c : conditional include gtkfilesystemwin32.h
* gdk/win32/gdkwindow-win32.c : implement
gdk_window_set_keep_above() and gdk_window_set_keep_below()
* tests/testmerge.c : don't include unistd.h unconditionally,
#define STDOUT_FILENO if it isn't defined
* tests/testfilechooser.c : make it compile on win32
2003-11-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is

View File

@ -1,3 +1,29 @@
2003-11-15 Hans Breuer <hans@breuer.org>
* gdk/makefile.msc gdk/gdk.def
gtk/gtk.def gtk/makefile.msc.in : updated
* tests/makefile.msc : added all the new tests
* gtk/gtkfilefilter.c(finalize) : initialize filter
from object not from itself
* gtk/gtkfilesystemwin32.[hc] : copied from gtkfilesystemunix.[hc]
modified as less as posible to have aworking implementation
on win32. There maybe the desire to merge the unchanged pats into
a common base class.
Also implemented a simple glib based bookmark handling, which
is currently missing in gtkfilesystemunix.[hc] but can be copied
over there.
* gtk/gtkfilechooserwidget.c : conditional include gtkfilesystemwin32.h
* gdk/win32/gdkwindow-win32.c : implement
gdk_window_set_keep_above() and gdk_window_set_keep_below()
* tests/testmerge.c : don't include unistd.h unconditionally,
#define STDOUT_FILENO if it isn't defined
* tests/testfilechooser.c : make it compile on win32
2003-11-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is

View File

@ -1,3 +1,29 @@
2003-11-15 Hans Breuer <hans@breuer.org>
* gdk/makefile.msc gdk/gdk.def
gtk/gtk.def gtk/makefile.msc.in : updated
* tests/makefile.msc : added all the new tests
* gtk/gtkfilefilter.c(finalize) : initialize filter
from object not from itself
* gtk/gtkfilesystemwin32.[hc] : copied from gtkfilesystemunix.[hc]
modified as less as posible to have aworking implementation
on win32. There maybe the desire to merge the unchanged pats into
a common base class.
Also implemented a simple glib based bookmark handling, which
is currently missing in gtkfilesystemunix.[hc] but can be copied
over there.
* gtk/gtkfilechooserwidget.c : conditional include gtkfilesystemwin32.h
* gdk/win32/gdkwindow-win32.c : implement
gdk_window_set_keep_above() and gdk_window_set_keep_below()
* tests/testmerge.c : don't include unistd.h unconditionally,
#define STDOUT_FILENO if it isn't defined
* tests/testfilechooser.c : make it compile on win32
2003-11-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is

View File

@ -1,3 +1,29 @@
2003-11-15 Hans Breuer <hans@breuer.org>
* gdk/makefile.msc gdk/gdk.def
gtk/gtk.def gtk/makefile.msc.in : updated
* tests/makefile.msc : added all the new tests
* gtk/gtkfilefilter.c(finalize) : initialize filter
from object not from itself
* gtk/gtkfilesystemwin32.[hc] : copied from gtkfilesystemunix.[hc]
modified as less as posible to have aworking implementation
on win32. There maybe the desire to merge the unchanged pats into
a common base class.
Also implemented a simple glib based bookmark handling, which
is currently missing in gtkfilesystemunix.[hc] but can be copied
over there.
* gtk/gtkfilechooserwidget.c : conditional include gtkfilesystemwin32.h
* gdk/win32/gdkwindow-win32.c : implement
gdk_window_set_keep_above() and gdk_window_set_keep_below()
* tests/testmerge.c : don't include unistd.h unconditionally,
#define STDOUT_FILENO if it isn't defined
* tests/testfilechooser.c : make it compile on win32
2003-11-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is

View File

@ -42,7 +42,10 @@ PERL = perl
CFLAGS = -FImsvc_recommended_pragmas.h -I . -I .. \
$(GLIB_CFLAGS) $(PANGO_CFLAGS) -I ../gdk-pixbuf \
$(G_DEBUGGING) -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN -DGDK_VERSION=\"$(GTK_VER)\"
$(G_DEBUGGING) -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN \
-DGDK_VERSION=\"$(GTK_VER)\" \
-DG_LOG_DOMAIN=\"Gdk\"
EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \
..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \
$(PANGOWIN32_LIBS) $(INTL_LIBS)

View File

@ -732,6 +732,12 @@ gdk_window_foreign_new_for_display (GdkDisplay *display,
private->state &= (~GDK_WINDOW_STATE_WITHDRAWN);
else
private->state |= GDK_WINDOW_STATE_WITHDRAWN;
if (GetWindowLong ((HWND)anid, GWL_EXSTYLE) & WS_EX_TOPMOST)
private->state |= GDK_WINDOW_STATE_ABOVE;
else
private->state &= (~GDK_WINDOW_STATE_ABOVE);
private->state &= (~GDK_WINDOW_STATE_BELOW);
private->depth = gdk_visual_get_system ()->depth;
_gdk_window_init_position (GDK_WINDOW (private));
@ -954,6 +960,19 @@ show_window_internal (GdkWindow *window,
old_active_window = GetActiveWindow ();
if (private->state & (GDK_WINDOW_STATE_BELOW | GDK_WINDOW_STATE_ABOVE))
{
DWORD exstyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
if (private->state & GDK_WINDOW_STATE_BELOW)
exstyle &= (~WS_EX_TOPMOST);
if (private->state & GDK_WINDOW_STATE_ABOVE)
exstyle |= WS_EX_TOPMOST;
if (!SetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE, exstyle))
WIN32_API_FAILED ("SetWindowLong");
}
if (private->state & GDK_WINDOW_STATE_FULLSCREEN)
gdk_window_fullscreen (window);
else if (private->state & GDK_WINDOW_STATE_MAXIMIZED)
@ -2702,6 +2721,46 @@ gdk_window_unfullscreen (GdkWindow *window)
}
}
void
gdk_window_set_keep_above (GdkWindow *window, gboolean setting)
{
g_return_if_fail (GDK_IS_WINDOW (window));
if (GDK_WINDOW_DESTROYED (window))
return;
if (GDK_WINDOW_IS_MAPPED (window))
{
if (!SetWindowPos(GDK_WINDOW_HWND (window), setting ? HWND_TOPMOST : HWND_NOTOPMOST,
0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE))
WIN32_API_FAILED ("SetWindowPos");
}
else
gdk_synthesize_window_state (window,
setting ? GDK_WINDOW_STATE_BELOW : GDK_WINDOW_STATE_ABOVE,
setting ? GDK_WINDOW_STATE_ABOVE : 0);
}
void
gdk_window_set_keep_below (GdkWindow *window, gboolean setting)
{
g_return_if_fail (GDK_IS_WINDOW (window));
if (GDK_WINDOW_DESTROYED (window))
return;
if (GDK_WINDOW_IS_MAPPED (window))
{
if (!SetWindowPos(GDK_WINDOW_HWND (window), setting ? HWND_BOTTOM : HWND_NOTOPMOST,
0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE))
WIN32_API_FAILED ("SetWindowPos");
}
else
gdk_synthesize_window_state (window,
setting ? GDK_WINDOW_STATE_ABOVE : GDK_WINDOW_STATE_BELOW,
setting ? GDK_WINDOW_STATE_BELOW : 0);
}
void
gdk_window_focus (GdkWindow *window,
guint32 timestamp)

View File

@ -38,6 +38,36 @@ EXPORTS
gtk_accelerator_valid
gtk_accessible_connect_widget_destroyed
gtk_accessible_get_type
gtk_action_activate
gtk_action_block_activate_from
gtk_action_connect_accelerator
gtk_action_connect_proxy
gtk_action_create_icon
gtk_action_create_menu_item
gtk_action_create_tool_item
gtk_action_disconnect_accelerator
gtk_action_disconnect_proxy
gtk_action_get_name
gtk_action_get_proxies
gtk_action_get_type
gtk_action_group_add_action
gtk_action_group_add_actions
gtk_action_group_add_actions_full
gtk_action_group_add_radio_actions
gtk_action_group_add_radio_actions_full
gtk_action_group_add_toggle_actions
gtk_action_group_add_toggle_actions_full
gtk_action_group_get_action
gtk_action_group_get_name
gtk_action_group_get_type
gtk_action_group_list_actions
gtk_action_group_new
gtk_action_group_remove_action
gtk_action_group_set_translate_func
gtk_action_group_set_translation_domain
gtk_action_set_accel_group
gtk_action_set_accel_path
gtk_action_unblock_activate_from
gtk_adjustment_changed
gtk_adjustment_clamp_page
gtk_adjustment_get_type
@ -168,17 +198,36 @@ EXPORTS
gtk_cell_renderer_toggle_set_active
gtk_cell_renderer_toggle_set_radio
gtk_cell_type_get_type
gtk_cell_view_get_displayed_row
gtk_cell_view_get_type
gtk_cell_view_menu_item_get_type
gtk_cell_view_menu_item_new
gtk_cell_view_menu_item_new_from_model
gtk_cell_view_menu_item_new_with_markup
gtk_cell_view_menu_item_new_with_pixbuf
gtk_cell_view_menu_item_new_with_text
gtk_cell_view_new
gtk_cell_view_new_with_markup
gtk_cell_view_new_with_pixbuf
gtk_cell_view_new_with_text
gtk_cell_view_set_background_color
gtk_cell_view_set_displayed_row
gtk_cell_view_set_model
gtk_cell_view_set_value
gtk_cell_view_set_values
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_active
gtk_check_menu_item_get_draw_as_radio
gtk_check_menu_item_get_inconsistent
gtk_check_menu_item_get_type
gtk_check_menu_item_new
gtk_check_menu_item_new_with_label
gtk_check_menu_item_new_with_mnemonic
gtk_check_menu_item_set_active
gtk_check_menu_item_set_draw_as_radio
gtk_check_menu_item_set_inconsistent
gtk_check_menu_item_set_show_toggle
gtk_check_menu_item_toggled
@ -307,6 +356,23 @@ EXPORTS
gtk_color_selection_set_previous_alpha
gtk_color_selection_set_previous_color
gtk_color_selection_set_update_policy
gtk_combo_box_append_text
gtk_combo_box_entry_get_text_column
gtk_combo_box_entry_get_type
gtk_combo_box_entry_new
gtk_combo_box_get_active
gtk_combo_box_get_active_iter
gtk_combo_box_get_model
gtk_combo_box_get_type
gtk_combo_box_insert_text
gtk_combo_box_new
gtk_combo_box_new_text
gtk_combo_box_prepend_text
gtk_combo_box_set_active
gtk_combo_box_set_active_iter
gtk_combo_box_set_column_span_column
gtk_combo_box_set_row_span_column
gtk_combo_box_set_wrap_width
gtk_combo_disable_activate
gtk_combo_get_type
gtk_combo_new
@ -316,6 +382,7 @@ EXPORTS
gtk_combo_set_use_arrows
gtk_combo_set_use_arrows_always
gtk_combo_set_value_in_list
gtk_combo_string_key
gtk_container_add
gtk_container_add_with_properties
gtk_container_check_resize
@ -558,8 +625,12 @@ EXPORTS
gtk_entry_set_visibility
gtk_entry_set_width_chars
gtk_entry_text_index_to_layout_index
gtk_event_box_get_above_child
gtk_event_box_get_type
gtk_event_box_get_visible_window
gtk_event_box_new
gtk_event_box_set_above_child
gtk_event_box_set_visible_window
gtk_events_pending
gtk_exit
gtk_expander_get_expanded
@ -577,6 +648,94 @@ EXPORTS
gtk_expander_set_use_underline
gtk_expander_style_get_type
gtk_false
gtk_file_chooser_action_get_type
gtk_file_chooser_add_filter
gtk_file_chooser_add_shortcut_folder
gtk_file_chooser_add_shortcut_folder_uri
gtk_file_chooser_dialog_get_type
gtk_file_chooser_dialog_new
gtk_file_chooser_error_get_type
gtk_file_chooser_error_quark
gtk_file_chooser_get_action
gtk_file_chooser_get_current_folder
gtk_file_chooser_get_current_folder_uri
gtk_file_chooser_get_extra_widget
gtk_file_chooser_get_filename
gtk_file_chooser_get_filenames
gtk_file_chooser_get_filter
gtk_file_chooser_get_folder_mode
gtk_file_chooser_get_local_only
gtk_file_chooser_get_preview_filename
gtk_file_chooser_get_preview_uri
gtk_file_chooser_get_preview_widget
gtk_file_chooser_get_preview_widget_active
gtk_file_chooser_get_select_multiple
gtk_file_chooser_get_type
gtk_file_chooser_get_uri
gtk_file_chooser_get_uris
gtk_file_chooser_list_filters
gtk_file_chooser_list_shortcut_folder_uris
gtk_file_chooser_list_shortcut_folders
gtk_file_chooser_remove_filter
gtk_file_chooser_remove_shortcut_folder
gtk_file_chooser_remove_shortcut_folder_uri
gtk_file_chooser_select_all
gtk_file_chooser_select_filename
gtk_file_chooser_select_uri
gtk_file_chooser_set_action
gtk_file_chooser_set_current_folder
gtk_file_chooser_set_current_folder_uri
gtk_file_chooser_set_current_name
gtk_file_chooser_set_extra_widget
gtk_file_chooser_set_filename
gtk_file_chooser_set_filter
gtk_file_chooser_set_folder_mode
gtk_file_chooser_set_local_only
gtk_file_chooser_set_preview_widget
gtk_file_chooser_set_preview_widget_active
gtk_file_chooser_set_select_multiple
gtk_file_chooser_set_uri
gtk_file_chooser_unselect_all
gtk_file_chooser_unselect_filename
gtk_file_chooser_unselect_uri
gtk_file_chooser_widget_get_type
gtk_file_chooser_widget_new
gtk_file_filter_add_custom
gtk_file_filter_add_mime_type
gtk_file_filter_add_pattern
gtk_file_filter_filter
gtk_file_filter_flags_get_type
gtk_file_filter_get_name
gtk_file_filter_get_needed
gtk_file_filter_get_type
gtk_file_filter_new
gtk_file_filter_set_name
gtk_file_folder_get_info
gtk_file_folder_get_type
gtk_file_folder_list_children
gtk_file_info_copy
gtk_file_info_free
gtk_file_info_get_display_key
gtk_file_info_get_display_name
gtk_file_info_get_icon_type
gtk_file_info_get_is_folder
gtk_file_info_get_is_hidden
gtk_file_info_get_mime_type
gtk_file_info_get_modification_time
gtk_file_info_get_size
gtk_file_info_get_type
gtk_file_info_new
gtk_file_info_render_icon
gtk_file_info_set_display_name
gtk_file_info_set_icon_type
gtk_file_info_set_is_folder
gtk_file_info_set_is_hidden
gtk_file_info_set_mime_type
gtk_file_info_set_modification_time
gtk_file_info_set_size
gtk_file_paths_copy
gtk_file_paths_free
gtk_file_paths_sort
gtk_file_selection_complete
gtk_file_selection_get_filename
gtk_file_selection_get_select_multiple
@ -587,6 +746,23 @@ EXPORTS
gtk_file_selection_set_filename
gtk_file_selection_set_select_multiple
gtk_file_selection_show_fileop_buttons
gtk_file_system_add_bookmark
gtk_file_system_error_quark
gtk_file_system_filename_to_path
gtk_file_system_get_folder
gtk_file_system_get_parent
gtk_file_system_get_root_info
gtk_file_system_get_type
gtk_file_system_list_bookmarks
gtk_file_system_list_roots
gtk_file_system_make_path
gtk_file_system_parse
gtk_file_system_path_to_filename
gtk_file_system_path_to_uri
gtk_file_system_remove_bookmark
gtk_file_system_unix_get_type
gtk_file_system_unix_new
gtk_file_system_uri_to_path
gtk_fixed_get_has_window
gtk_fixed_get_type
gtk_fixed_move
@ -698,6 +874,7 @@ EXPORTS
gtk_icon_info_get_type
gtk_icon_info_load_icon
gtk_icon_info_set_raw_coordinates
gtk_icon_lookup_flags_get_type
gtk_icon_set_add_source
gtk_icon_set_copy
gtk_icon_set_get_sizes
@ -738,6 +915,7 @@ EXPORTS
gtk_icon_source_set_state_wildcarded
gtk_icon_theme_add_builtin_icon
gtk_icon_theme_append_search_path
gtk_icon_theme_error_get_type
gtk_icon_theme_error_quark
gtk_icon_theme_get_default
gtk_icon_theme_get_example_icon_name
@ -989,6 +1167,7 @@ EXPORTS
gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM
gtk_marshal_VOID__UINT_STRING
gtk_match_type_get_type
gtk_menu_attach
gtk_menu_attach_to_widget
gtk_menu_bar_get_type
gtk_menu_bar_new
@ -1223,6 +1402,10 @@ EXPORTS
gtk_quit_add_full
gtk_quit_remove
gtk_quit_remove_by_data
gtk_radio_action_get_current_value
gtk_radio_action_get_group
gtk_radio_action_get_type
gtk_radio_action_set_group
gtk_radio_button_get_group
gtk_radio_button_get_type
gtk_radio_button_new
@ -1347,8 +1530,10 @@ EXPORTS
gtk_separator_get_type
gtk_separator_menu_item_get_type
gtk_separator_menu_item_new
gtk_separator_tool_item_get_draw
gtk_separator_tool_item_get_type
gtk_separator_tool_item_new
gtk_separator_tool_item_set_draw
gtk_set_locale
gtk_settings_get_default
gtk_settings_get_for_screen
@ -1464,6 +1649,7 @@ EXPORTS
gtk_tearoff_menu_item_get_type
gtk_tearoff_menu_item_new
gtk_text_anchored_child_set_layout
gtk_text_attr_appearance_type
gtk_text_attributes_copy
gtk_text_attributes_copy_values
gtk_text_attributes_get_type
@ -1529,6 +1715,7 @@ EXPORTS
gtk_text_buffer_set_modified
gtk_text_buffer_set_text
gtk_text_byte_begins_utf8_char
gtk_text_char_type
gtk_text_child_anchor_get_deleted
gtk_text_child_anchor_get_type
gtk_text_child_anchor_get_widgets
@ -1536,6 +1723,7 @@ EXPORTS
gtk_text_child_anchor_queue_resize
gtk_text_child_anchor_register_child
gtk_text_child_anchor_unregister_child
gtk_text_child_type
gtk_text_direction_get_type
gtk_text_forward_delete
gtk_text_freeze
@ -1554,6 +1742,10 @@ EXPORTS
gtk_text_iter_backward_sentence_start
gtk_text_iter_backward_sentence_starts
gtk_text_iter_backward_to_tag_toggle
gtk_text_iter_backward_visible_cursor_position
gtk_text_iter_backward_visible_cursor_positions
gtk_text_iter_backward_visible_word_start
gtk_text_iter_backward_visible_word_starts
gtk_text_iter_backward_word_start
gtk_text_iter_backward_word_starts
gtk_text_iter_begins_tag
@ -1579,6 +1771,10 @@ EXPORTS
gtk_text_iter_forward_to_end
gtk_text_iter_forward_to_line_end
gtk_text_iter_forward_to_tag_toggle
gtk_text_iter_forward_visible_cursor_position
gtk_text_iter_forward_visible_cursor_positions
gtk_text_iter_forward_visible_word_end
gtk_text_iter_forward_visible_word_ends
gtk_text_iter_forward_word_end
gtk_text_iter_forward_word_ends
gtk_text_iter_free
@ -1662,6 +1858,7 @@ EXPORTS
gtk_text_layout_wrap
gtk_text_layout_wrap_loop_end
gtk_text_layout_wrap_loop_start
gtk_text_left_mark_type
gtk_text_line_segment_split
gtk_text_mark_get_buffer
gtk_text_mark_get_deleted
@ -1671,6 +1868,8 @@ EXPORTS
gtk_text_mark_get_visible
gtk_text_mark_set_visible
gtk_text_new
gtk_text_pixbuf_type
gtk_text_right_mark_type
gtk_text_search_flags_get_type
gtk_text_set_adjustments
gtk_text_set_editable
@ -1690,6 +1889,8 @@ EXPORTS
gtk_text_tag_table_new
gtk_text_tag_table_remove
gtk_text_thaw
gtk_text_toggle_off_type
gtk_text_toggle_on_type
gtk_text_unknown_char_utf8
gtk_text_view_add_child_at_anchor
gtk_text_view_add_child_in_window
@ -1698,6 +1899,7 @@ EXPORTS
gtk_text_view_buffer_to_window_coords
gtk_text_view_forward_display_line
gtk_text_view_forward_display_line_end
gtk_text_view_get_accepts_tab
gtk_text_view_get_border_window_size
gtk_text_view_get_buffer
gtk_text_view_get_cursor_visible
@ -1730,6 +1932,7 @@ EXPORTS
gtk_text_view_scroll_mark_onscreen
gtk_text_view_scroll_to_iter
gtk_text_view_scroll_to_mark
gtk_text_view_set_accepts_tab
gtk_text_view_set_border_window_size
gtk_text_view_set_buffer
gtk_text_view_set_cursor_visible
@ -1759,6 +1962,12 @@ EXPORTS
gtk_tips_query_set_labels
gtk_tips_query_start_query
gtk_tips_query_stop_query
gtk_toggle_action_get_active
gtk_toggle_action_get_draw_as_radio
gtk_toggle_action_get_type
gtk_toggle_action_set_active
gtk_toggle_action_set_draw_as_radio
gtk_toggle_action_toggled
gtk_toggle_button_get_active
gtk_toggle_button_get_inconsistent
gtk_toggle_button_get_mode
@ -1791,8 +2000,8 @@ EXPORTS
gtk_tool_item_get_expand
gtk_tool_item_get_homogeneous
gtk_tool_item_get_icon_size
gtk_tool_item_get_is_important
gtk_tool_item_get_orientation
gtk_tool_item_get_pack_end
gtk_tool_item_get_proxy_menu_item
gtk_tool_item_get_relief_style
gtk_tool_item_get_toolbar_style
@ -1804,7 +2013,7 @@ EXPORTS
gtk_tool_item_retrieve_proxy_menu_item
gtk_tool_item_set_expand
gtk_tool_item_set_homogeneous
gtk_tool_item_set_pack_end
gtk_tool_item_set_is_important
gtk_tool_item_set_proxy_menu_item
gtk_tool_item_set_tooltip
gtk_tool_item_set_use_drag_window
@ -1838,6 +2047,7 @@ EXPORTS
gtk_toolbar_prepend_space
gtk_toolbar_prepend_widget
gtk_toolbar_remove_space
gtk_toolbar_set_drop_highlight_item
gtk_toolbar_set_icon_size
gtk_toolbar_set_orientation
gtk_toolbar_set_show_arrow
@ -1845,6 +2055,7 @@ EXPORTS
gtk_toolbar_set_tooltips
gtk_toolbar_space_style_get_type
gtk_toolbar_style_get_type
gtk_toolbar_unhighlight_drop_location
gtk_toolbar_unset_icon_size
gtk_toolbar_unset_style
gtk_tooltips_data_get
@ -2145,6 +2356,23 @@ EXPORTS
gtk_type_init
gtk_type_new
gtk_type_unique
gtk_ui_manager_add_ui
gtk_ui_manager_add_ui_from_file
gtk_ui_manager_add_ui_from_string
gtk_ui_manager_ensure_update
gtk_ui_manager_get_accel_group
gtk_ui_manager_get_action
gtk_ui_manager_get_action_groups
gtk_ui_manager_get_add_tearoffs
gtk_ui_manager_get_type
gtk_ui_manager_get_ui
gtk_ui_manager_get_widget
gtk_ui_manager_insert_action_group
gtk_ui_manager_new
gtk_ui_manager_new_merge_id
gtk_ui_manager_remove_action_group
gtk_ui_manager_remove_ui
gtk_ui_manager_set_add_tearoffs
gtk_update_type_get_type
gtk_vbox_get_type
gtk_vbox_new
@ -2210,6 +2438,7 @@ EXPORTS
gtk_widget_get_extension_events
gtk_widget_get_modifier_style
gtk_widget_get_name
gtk_widget_get_no_show_all
gtk_widget_get_pango_context
gtk_widget_get_parent
gtk_widget_get_parent_window
@ -2275,6 +2504,7 @@ EXPORTS
gtk_widget_set_events
gtk_widget_set_extension_events
gtk_widget_set_name
gtk_widget_set_no_show_all
gtk_widget_set_parent
gtk_widget_set_parent_window
gtk_widget_set_redraw_on_allocate
@ -2322,7 +2552,6 @@ EXPORTS
gtk_window_get_mnemonic_modifier
gtk_window_get_modal
gtk_window_get_position
gtk_window_get_private
gtk_window_get_resizable
gtk_window_get_role
gtk_window_get_screen
@ -2337,6 +2566,8 @@ EXPORTS
gtk_window_group_get_type
gtk_window_group_new
gtk_window_group_remove_window
gtk_window_has_toplevel_focus
gtk_window_is_active
gtk_window_iconify
gtk_window_list_toplevels
gtk_window_maximize
@ -2388,15 +2619,3 @@ EXPORTS
gtk_window_unmaximize
gtk_window_unstick
gtk_wrap_mode_get_type
; gtk_plug_construct
; gtk_plug_construct_for_display
; gtk_plug_get_id
; gtk_plug_get_type
; gtk_plug_new
; gtk_plug_new_for_display
; gtk_socket_add_id
; gtk_socket_get_id
; gtk_socket_get_type
; gtk_socket_new
; gtk_socket_steal

View File

@ -24,6 +24,9 @@
#ifdef G_OS_UNIX
#include "gtkfilesystemunix.h"
#endif
#ifdef G_OS_WIN32
#include "gtkfilesystemwin32.h"
#endif
#include "gtktypebuiltins.h"
struct _GtkFileChooserWidgetPrivate

View File

@ -133,7 +133,7 @@ filter_rule_free (FilterRule *rule)
static void
gtk_file_filter_finalize (GObject *object)
{
GtkFileFilter *filter = GTK_FILE_FILTER (filter);
GtkFileFilter *filter = GTK_FILE_FILTER (object);
g_slist_foreach (filter->rules, (GFunc)filter_rule_free, NULL);

1015
gtk/gtkfilesystemwin32.c Normal file

File diff suppressed because it is too large Load Diff

40
gtk/gtkfilesystemwin32.h Normal file
View File

@ -0,0 +1,40 @@
/* GTK - The GIMP Toolkit
* gtkfilesystemunix.h: Default implementation of GtkFileSystem for UNIX-like systems
* Copyright (C) 2003, Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GTK_FILE_SYSTEM_UNIX_H__
#define __GTK_FILE_SYSTEM_UNIX_H__
#include <glib-object.h>
#include "gtkfilesystem.h"
G_BEGIN_DECLS
#define GTK_TYPE_FILE_SYSTEM_UNIX (gtk_file_system_unix_get_type ())
#define GTK_FILE_SYSTEM_UNIX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_SYSTEM_UNIX, GtkFileSystemUnix))
#define GTK_IS_FILE_SYSTEM_UNIX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_SYSTEM_UNIX))
typedef struct _GtkFileSystemUnix GtkFileSystemUnix;
GtkFileSystem *gtk_file_system_unix_new (void);
GType gtk_file_system_unix_get_type (void);
G_END_DECLS
#endif /* __GTK_FILE_SYSTEM_UNIX_H__ */

View File

@ -34,7 +34,8 @@ LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG)
DEFINES = $(G_DEBUGGING) -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear \
-DPANGO_ENABLE_BACKEND \
-DGTK_VERSION=\"$(GTK_VER)\" -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
-DGTK_HOST=\"win32\"
-DGTK_HOST=\"win32\" \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
TOUCH = copy makefile.msc+nul
@ -58,6 +59,8 @@ gtk_OBJECTS = \
gtkaccellabel.obj \
gtkaccelmap.obj \
gtkaccessible.obj \
gtkaction.obj \
gtkactiongroup.obj \
gtkadjustment.obj \
gtkalignment.obj \
gtkarrow.obj \
@ -74,6 +77,9 @@ gtk_OBJECTS = \
gtkcellrenderertext.obj \
gtkcellrenderertoggle.obj \
gtkcellrendererpixbuf.obj \
gtkcellrendererseptext.obj \
gtkcellview.obj \
gtkcellviewmenuitem.obj \
gtkcheckbutton.obj \
gtkcheckmenuitem.obj \
gtkclipboard.obj \
@ -82,6 +88,8 @@ gtk_OBJECTS = \
gtkcolorsel.obj \
gtkcolorseldialog.obj \
gtkcombo.obj \
gtkcombobox.obj \
gtkcomboboxentry.obj \
gtkcontainer.obj \
gtkctree.obj \
gtkcurve.obj \
@ -93,7 +101,17 @@ gtk_OBJECTS = \
gtkentrycompletion.obj \
gtkeventbox.obj \
gtkexpander.obj \
gtkfilechooser.obj \
gtkfilechooserdefault.obj \
gtkfilechooserdialog.obj \
gtkfilechooserentry.obj \
gtkfilechooserutils.obj \
gtkfilechooserwidget.obj \
gtkfilefilter.obj \
gtkfilesel.obj \
gtkfilesystem.obj \
gtkfilesystemmodel.obj \
gtkfilesystemwin32.obj \
gtkfixed.obj \
gtkfontsel.obj \
gtkfontbutton.obj \
@ -147,6 +165,7 @@ gtk_OBJECTS = \
gtkpreview.obj \
gtkprogress.obj \
gtkprogressbar.obj \
gtkradioaction.obj \
gtkradiobutton.obj \
gtkradiotoolbutton.obj \
gtkradiomenuitem.obj \
@ -187,6 +206,7 @@ gtk_OBJECTS = \
gtktextview.obj \
gtkthemes.obj \
gtktipsquery.obj \
gtktoggleaction.obj \
gtktogglebutton.obj \
gtktoggletoolbutton.obj \
gtktoolbar.obj \
@ -207,6 +227,7 @@ gtk_OBJECTS = \
gtktreeviewcolumn.obj \
gtktypeutils.obj \
gtktypebuiltins.obj \
gtkuimanager.obj \
gtkvbbox.obj \
gtkvbox.obj \
gtkviewport.obj \
@ -264,6 +285,10 @@ gtk_public_h_sources = \
gtkenums.h \
gtkeventbox.h \
gtkexpander.h \
gtkfilechooser.h \
gtkfilechooserdialog.h \
gtkfilechooserwidget.h \
gtkfilefilter.h \
gtkfilesel.h \
gtkfixed.h \
gtkfontbutton.h \
@ -450,11 +475,14 @@ gtkmarshal.c : gtkmarshal.list
gtksignal.obj : gtksignal.c gtkmarshal.c gtkmarshal.h
$(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" gtksignal.c
gtk.res : gtk.rc
rc -DBUILDNUMBER=0 -r -fo gtk.res gtk.rc
#
# Linking:
#
libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def
$(CC) $(CFLAGS) -LD -Fm -Fe$@ $(gtk_OBJECTS) \
libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def gtk.res
$(CC) $(CFLAGS) -LD -Fm -Fe$@ $(gtk_OBJECTS) gtk.res \
$(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) \
gdi32.lib user32.lib advapi32.lib wsock32.lib \
$(LDFLAGS) /implib:gtk-win32-$(GTK_VER).lib /def:gtk.def

View File

@ -38,11 +38,22 @@ all : \
#
# Test programs:
#
TESTAPPS = testcalendar testdnd testgtk testinput testrgb testselection \
testtext testtextbuffer testsocket testsocket_child \
testtreeedit testtreeflow \
testtreecolumns testtreefocus testtreesort testtreeview treestoretest \
testthreads simple
TESTAPPS = \
testabi testactions \
testcalendar testcombo \
testdnd \
testfilechooser \
testgtk \
testicontheme testinput \
testmenus testmerge testmultidisplay testmultiscreen \
testrgb \
testselection \
testtext testtextbuffer testtoolbar \
testtreecolumns testtreeedit testtreeflow testtreefocus \
testtreesort testtreeview treestoretest \
testsocket testsocket_child \
testthreads \
simple
all-test-apps:
@ -65,8 +76,17 @@ EXTRA_OBJETCS = prop-editor.obj
EXTRA_OBJETCS = prop-editor.obj
!ENDIF
!IFDEF EXTRA_testtoolbar
EXTRA_OBJETCS = prop-editor.obj
!ENDIF
!IFDEF EXTRA_testfilechooser
EXTRA_OBJETCS = prop-editor.obj
EXTRA_LIBS = gdi32.lib user32.lib shell32.lib
!ENDIF
$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj
$(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
$(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(EXTRA_LIBS) $(LDFLAGS)
$(TESTAPP).obj : $(TESTAPP).c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"$(TESTAPP)\" $(TESTAPP).c

View File

@ -1,11 +1,26 @@
#include "config.h"
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h>
#include <time.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <gtk/gtk.h>
#ifdef G_OS_WIN32
# define WIN32_MEAN_AND_LEAN
# include <windows.h> /* ExtractAssociatedIcon */
# include <io.h>
# define localtime_r(t,b) localtime(t)
# ifndef S_ISREG
# define S_ISREG(m) ((m) & _S_IFREG)
# endif
# include <gdk/win32/gdkwin32.h> /* gdk_win32_hdc_get */
#endif
#include "prop-editor.h"
static GtkWidget *preview_label;

View File

@ -1,8 +1,16 @@
#include "config.h"
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <gtk/gtk.h>
#ifndef STDOUT_FILENO
#define STDOUT_FILENO 1
#endif
struct { const gchar *filename; guint merge_id; } merge_ids[] = {
{ "merge-1.ui", 0 },
{ "merge-2.ui", 0 },