Commit 3eb0ecf4 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

updated exports

2001-01-06  Hans Breuer  <hans@breuer.org>

	* gdk/gdk.def : updated exports

	* gdk/win32/makefile.msc : -DGDK_ENABLE_BROKEN otherwise
	gdk won't compile anymore

	* gdk/win32/gdkevents-win32.c : initialize ret_val when
	processing GDK_FILTER functions, initialize event.key->hardware_keycode.
	Improved gdk_flush () to not only do pending drawing operations
	but also process all currently pending events. This should make
	the behaviour more similar to the X11 version.

	* gdk/win32/gdkgc-win32.c (predraw_set_background) : a background
	option needs to be set even if there is no GDK_GC_BACKGROUND.
	(gdk_win32_hdc_get) : use predraw_set_background () independent
	of value_mask. This allows to draw dashed lines leaving the original
	background intact.

	* gdk/win32/gdkimage-win32.c (gdk_image_new_bitamp) : free data
	after processing, because we can't reuse it as the X11 version does.

	* gtk/gtk.def : updated exports

	* gtk/makefile.msc.in : added ATK, removed all test apps. (I
	would like to get rid of this file again, and use straight
	makefile.msc again, as the other Gtk+ subdirs do)

	* test/makefile.msc (new file) : build the test apps here

(phase two: something has send me a broken pipe signal :)
parent 1fa43ed5
......@@ -24,62 +24,11 @@ EXPORTS
GTK_TYPE_DIALOG_FLAGS
GTK_TYPE_DIRECTION_TYPE
GTK_TYPE_FUNDAMENTAL_TYPE
GTK_TYPE_GDK_AXIS_USE
GTK_TYPE_GDK_BYTE_ORDER
GTK_TYPE_GDK_CAP_STYLE
; GTK_TYPE_GDK_COLOR
GTK_TYPE_GDK_CROSSING_MODE
GTK_TYPE_GDK_CURSOR_TYPE
GTK_TYPE_GDK_DRAG_ACTION
GTK_TYPE_GDK_DRAG_PROTOCOL
; GTK_TYPE_GDK_EVENT
GTK_TYPE_GDK_EVENT_MASK
GTK_TYPE_GDK_EVENT_TYPE
GTK_TYPE_GDK_EXTENSION_MODE
GTK_TYPE_GDK_FILL
GTK_TYPE_GDK_FILL_RULE
GTK_TYPE_GDK_FILTER_RETURN
; GTK_TYPE_GDK_FONT
GTK_TYPE_GDK_FONT_TYPE
GTK_TYPE_GDK_FUNCTION
GTK_TYPE_GDK_GC_VALUES_MASK
GTK_TYPE_GDK_GRAB_STATUS
GTK_TYPE_GDK_GRAVITY
GTK_TYPE_GDK_IMAGE_TYPE
GTK_TYPE_GDK_INPUT_CONDITION
GTK_TYPE_GDK_INPUT_MODE
GTK_TYPE_GDK_INPUT_SOURCE
GTK_TYPE_GDK_JOIN_STYLE
GTK_TYPE_GDK_LINE_STYLE
GTK_TYPE_GDK_MODIFIER_TYPE
GTK_TYPE_GDK_NOTIFY_TYPE
GTK_TYPE_GDK_OVERLAP_TYPE
GTK_TYPE_GDK_PROPERTY_STATE
GTK_TYPE_GDK_PROP_MODE
GTK_TYPE_GDK_RGB_DITHER
GTK_TYPE_GDK_SCROLL_DIRECTION
GTK_TYPE_GDK_SELECTION
GTK_TYPE_GDK_SELECTION_TYPE
GTK_TYPE_GDK_STATUS
GTK_TYPE_GDK_SUBWINDOW_MODE
GTK_TYPE_GDK_TARGET
GTK_TYPE_GDK_VISIBILITY_STATE
; GTK_TYPE_GDK_VISUAL
GTK_TYPE_GDK_VISUAL_TYPE
GTK_TYPE_GDK_WINDOW_ATTRIBUTES_TYPE
GTK_TYPE_GDK_WINDOW_CLASS
GTK_TYPE_GDK_WINDOW_HINTS
GTK_TYPE_GDK_WINDOW_STATE
GTK_TYPE_GDK_WINDOW_TYPE
GTK_TYPE_GDK_WINDOW_TYPE_HINT
GTK_TYPE_GDK_WM_DECORATION
GTK_TYPE_GDK_WM_FUNCTION
GTK_TYPE_ICON_SIZE
GTK_TYPE_IMAGE_TYPE
GTK_TYPE_JUSTIFICATION
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
......@@ -345,15 +294,15 @@ EXPORTS
gtk_color_selection_dialog_new
gtk_color_selection_get_color
gtk_color_selection_get_type
gtk_color_selection_get_use_opacity
gtk_color_selection_get_use_palette
gtk_color_selection_get_has_opacity_control
gtk_color_selection_get_has_palette
gtk_color_selection_is_adjusting
gtk_color_selection_new
gtk_color_selection_set_color
gtk_color_selection_set_update_policy
gtk_color_selection_set_use_opacity
gtk_color_selection_set_use_palette
gtk_color_selection_unset_palette_color
gtk_color_selection_set_has_opacity_control
gtk_color_selection_set_has_palette
;s? gtk_color_selection_unset_palette_color
gtk_combo_disable_activate
gtk_combo_get_type
gtk_combo_new
......@@ -775,8 +724,10 @@ EXPORTS
gtk_list_store_insert_after
gtk_list_store_insert_before
gtk_list_store_new
gtk_list_store_new_with_types
gtk_list_store_prepend
gtk_list_store_remove
gtk_list_store_set
gtk_list_store_set_column_type
gtk_list_store_set_n_columns
gtk_list_store_set_value
......@@ -835,7 +786,6 @@ EXPORTS
gtk_menu_bar_insert
gtk_menu_bar_new
gtk_menu_bar_prepend
gtk_menu_bar_set_shadow_type
gtk_menu_detach
gtk_menu_get_accel_group
gtk_menu_get_active
......@@ -1414,7 +1364,6 @@ EXPORTS
gtk_toolbar_append_item
gtk_toolbar_append_space
gtk_toolbar_append_widget
gtk_toolbar_get_button_relief
gtk_toolbar_get_type
gtk_toolbar_insert_element
gtk_toolbar_insert_item
......@@ -1426,11 +1375,8 @@ EXPORTS
gtk_toolbar_prepend_item
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
gtk_toolbar_set_style
gtk_toolbar_set_tooltips
gtk_tooltips_data_get
......@@ -1464,6 +1410,7 @@ EXPORTS
gtk_tree_item_set_subtree
gtk_tree_model_deleted
gtk_tree_model_get_column_type
gtk_tree_model_get
gtk_tree_model_get_first
gtk_tree_model_get_flags
gtk_tree_model_get_iter
......@@ -1494,6 +1441,10 @@ EXPORTS
gtk_tree_path_get_depth
gtk_tree_path_get_indices
gtk_tree_path_new
gtk_tree_path_new_from_string
gtk_tree_path_prepend_index
gtk_tree_view_set_rows_drag_dest
gtk_tree_view_set_rows_drag_source
gtk_tree_prepend
gtk_tree_remove_item
gtk_tree_remove_items
......@@ -1561,6 +1512,7 @@ EXPORTS
gtk_tree_view_column_set_alignment
gtk_tree_view_column_set_attributes
gtk_tree_view_column_set_cell_data
gtk_tree_view_column_set_cell_data_func
gtk_tree_view_column_set_cell_renderer
gtk_tree_view_column_set_clickable
gtk_tree_view_column_set_max_width
......@@ -1588,6 +1540,7 @@ EXPORTS
gtk_tree_view_get_type
gtk_tree_view_get_vadjustment
gtk_tree_view_insert_column
gtk_tree_view_insert_column_with_attributes
gtk_tree_view_new
gtk_tree_view_new_with_model
gtk_tree_view_remove_column
......@@ -1787,3 +1740,4 @@ EXPORTS
gtk_window_unmaximize
gtk_window_unstick
......@@ -23,12 +23,12 @@ GDK_PIXBUF_LIBS = ../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
PERL = perl
AWK = gawk
INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf
DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS)
LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf
DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS)
LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG)
# Some files use near as an identifier
# Don't define GTK_COMPILATION here, because it's for gtk-x.x.dll only
DEFINES = -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"$(GTK_VER)\"
DEFINES = -DG_ENABLE_DEBUG -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"$(GTK_VER)\"
TOUCH = copy makefile.msc+nul
......@@ -38,15 +38,6 @@ 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.obj \
......@@ -394,70 +385,6 @@ gtk-win32-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def
.c.obj :
$(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" $<
#
# Test programs:
#
testcalendar.exe : gtk-win32-$(GTK_VER).dll testcalendar.obj
$(CC) $(CFLAGS) testcalendar.obj $(GTK_LIBS) $(GDK_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
# Must have separate rules for these objects that don't go in the DLL
testcalendar.obj : testcalendar.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testcalendar\" testcalendar.c
testdnd.exe : gtk-win32-$(GTK_VER).dll testdnd.obj
$(CC) $(CFLAGS) testdnd.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
testdnd.obj : testdnd.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testdnd\" testdnd.c
testgtk.exe : gtk-win32-$(GTK_VER).dll testgtk.obj
$(CC) $(CFLAGS) testgtk.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(LDFLAGS)
testgtk.obj : testgtk.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgtk\" testgtk.c
testinput.exe : gtk-win32-$(GTK_VER).dll testinput.obj
$(CC) $(CFLAGS) testinput.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
testinput.obj : testinput.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testinput\" testinput.c
testrgb.exe : gtk-win32-$(GTK_VER).dll testrgb.obj
$(CC) $(CFLAGS) testrgb.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
testrgb.obj : testrgb.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testrgb\" testrgb.c
testselection.exe : gtk-win32-$(GTK_VER).dll testselection.obj
$(CC) $(CFLAGS) testselection.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
testselection.obj : testselection.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testselection\" testselection.c
testtext.exe : gtk-win32-$(GTK_VER).dll testtext.obj
$(CC) $(CFLAGS) testtext.obj $(PANGO_LIBS) $(GDK_PIXBUF_LIBS) $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
testtext.obj : testtext.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testtext\" testtext.c
testtextbuffer.exe : gtk-win32-$(GTK_VER).dll testtextbuffer.obj
$(CC) $(CFLAGS) testtextbuffer.obj $(GDK_PIXBUF_LIBS) $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
testtextbuffer.obj : testtextbuffer.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testtextbuffer\" testtextbuffer.c
testthreads.exe : gtk-win32-$(GTK_VER).dll testthreads.obj
$(CC) $(CFLAGS) testthreads.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(PTHREAD_LIBS) $(LDFLAGS)
testthreads.obj : testthreads.c
$(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c
simple.exe : gtk-win32-$(GTK_VER).dll simple.obj
$(CC) $(CFLAGS) simple.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
simple.obj : simple.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"simple\" simple.c
$(EXAMPLE).obj : ..\examples\$(EXAMPLE)\$(EXAMPLE).c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"$(EXAMPLE)\" ..\examples\$(EXAMPLE)\$(EXAMPLE).c
......
## Makefile for building the gtk test apps with Microsoft C
## Use: nmake -f makefile.msc
## There is no install target, you have to decide where and
## how to install for yourself.
TOP = ..\..
!INCLUDE $(TOP)/build/win32/make.msc
################################################################
# Possibly override versions from build/win32/module.defs
GTK_VER = 1.3
GDK_PIXBUF_VER = 1.3
GTK_VER=1.3
GDK_LIBS = ../gdk/gdk-win32-$(GTK_VER).lib
GTK_LIBS = ../gtk/gtk-win32-$(GTK_VER).lib
GDK_PIXBUF_LIBS = ../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf -I ../gtk
DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS)
LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
DEFINES = -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"GtkTest\" -DGTK_VERSION=\"$(GTK_VER)\"
TOUCH = copy makefile.msc+nul
!IFNDEF TESTAPP
all : \
..\config.h \
prop-editor.obj \
all-test-apps
..\config.h : ..\config.h.win32
copy ..\config.h.win32 ..\config.h
#
# Test programs:
#
TESTAPPS = testcalendar testdnd testgtk testinput testrgb testselection \
testtext testtextbuffer testsocket testsocket_child \
testtreecolumns testtreefocus testtreesort testtreeview treestoretest \
testthreads simple
all-test-apps:
for %d in ($(TESTAPPS)) do nmake -nologo -f makefile.msc one-test-app THIS=%d
one-test-app:
@nmake -nologo -f makefile.msc $(THIS).exe TESTAPP=$(THIS) EXTRA_$(THIS)=1
!ELSE
!IFDEF EXTRA_testgtk
EXTRA_OBJETCS = prop-editor.obj
!ENDIF
!IFDEF EXTRA_testtreeview
EXTRA_OBJETCS = prop-editor.obj
!ENDIF
$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).dll $(TESTAPP).obj
$(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
$(TESTAPP).obj : $(TESTAPP).c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"$(TESTAPP)\" $(TESTAPP).c
!ENDIF
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment