mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-19 01:40:10 +00:00
aeaaae04ac
Wed Jun 5 18:34:47 2002 Owen Taylor <otaylor@redhat.com> Changes multihead reorganizing code for win32 support, mostly from a patch by Hans Breuer. * gdk/gdkcolor.c gdk/x11/gdkcolor-x11.c gdk/gdkcursor.c gdk/x11/gdkcursor-x11.c gdk/gdkevents.c gdk/x11/gdkevents-x11.c gdk/gdkfont.c gdk/x11/gdkfont-x11.c gdk/gdkkeys.c gdk/x11/gdkkeys-x11.c gdk/gdkimage.c gdk/x11/gdkimage-x11.c gdk/gdkscreen.c gdk/x11/gdkmain-x11.c gdk/gdkdisplay.c gdk/gdkevents-x11.c gdk/gdkpango.c gdk/x11/gdkpango-x11.c gdk/gdkselection.c gdk/x11/gdkselection-x11.c gdk/gdkwindow.c gdk/x11/gdkwindow-x11.c gdk/gdkvisual.c gdk/x11/gdkvisual-x11.c: Move port-independent singlehead wrapper functions into port-independent part of GDK. (#80009) * gdk/win32/gdkcolor-win32.c gdk/win32/gdkcursor-win32.c gdk/win32/gdkevents-win32.c gdk/win32/gdkfont-win32.c gdk/win32/gdkimage-win32.c gdk/win32/gdkkeys-win32.c gdk/win32/gdkmain-win32.c gdk/win32/gdkproperty-win32.c gdk/win32/gdkselection-win32.c gdk/win32/gkwindow-win32.c: Turn singlehead functions into "multihead" functions that ignore their GdkDisplay or GdkScreen arguments. * gdk/win32/gdkdrawable-win32.c gdk/win32/gdkevents-win32.c gdk/win32/gdkinput-win32.c gdk/win32/gdkprivate-win32.h: Misc multihead-compatibility changes. * gtk/gtk.def gdk/gdk.def: Update for multihead functions. * gdk/gdkcolormap.h gdk/gdkvisual.h gdk/x11/gdkcolormap-x11.c gdk/x11/gdkvisual-x11.c: Remove the screen fields from the public parts of the colormap/visual structures, add accessors instead. * gdk/gdkpixbuf-render.c gdk/gdkpixmap.c gdk/gdkrgb.c gdk/x11/gdkcolormap-x11.c gdk/x11/gdkimage-x11.c gdk/x11/gdkimage-x11.c gdk/x11/gdkprivate-x11.h gtk/gtkgc.c gtk/gtkstyle.c gtk/gtkwidget.c: Use accessors to get the screen for colormaps, visuals; move the fields into the private structures for the x11 backend. * gdk/gdkdisplay.[ch] gdk/x11/gdkdisplay-x11.[ch] gdk/gdkscreen.[ch] gdk/x11/gdkscreen-x11.c: Remove virtualization of screen and display functions. (#79990, patch from Erwann Chenede) * gdk/win32/gdkdisplay-x11.c gdk/win32/gdkscreen-win32.c gdk/win32/{Makefile.am, makefile.msc, makefile.mingw}: New files containing stub implementations of Display, Screen functions. * gdk/x11/gdkscreen-x11.[ch] gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkx.h: Clean up function exports and what headers they are in. (#79954) * gdk/x11/gdkx.h: Fix macro that was referring to a non-existant screen->screen_num. (In the patch for #79972, Erwann Chenede) * gdk/gdkscreen.c gdk/gdkwindow.c gdk/x11/gdkinternals.h gdk/x11/gdkscreen-x11.c: Fix gdk_screen_get_window_at_pointer() to use window hooks. (#79972, patch partly from Erwann Chenede) * gdk/x11/gdkdisplay-x11.c gdk/x11/gdkevents-x11.c: Fix some warnings.
74 lines
1.6 KiB
Plaintext
74 lines
1.6 KiB
Plaintext
## Makefile for building the GDK DLL with Microsoft C
|
|
## Use: nmake -f makefile.msc
|
|
|
|
# Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
|
|
WTKIT = ..\..\..\wtkit126
|
|
|
|
################################################################
|
|
|
|
# Nothing much configurable below
|
|
|
|
TOP = ../../..
|
|
!INCLUDE $(TOP)/glib/build/win32/make.msc
|
|
|
|
GTK_VER=2.0
|
|
|
|
CFLAGS = -FImsvc_recommended_pragmas.h \
|
|
-I. -I.. -I..\.. $(GLIB_CFLAGS) $(PANGO_CFLAGS) \
|
|
-I$(WTKIT)\include -I$(GLIB) \
|
|
$(G_DEBUGGING) -DHAVE_CONFIG_H -DINSIDE_GDK_WIN32 -DGDK_VERSION=\"$(GTK_VER)\"
|
|
|
|
all: \
|
|
..\..\config.h \
|
|
..\gdkconfig.h \
|
|
gdk-win32.lib \
|
|
gdk.res
|
|
|
|
gdk_win32_OBJECTS = \
|
|
gdkcolor-win32.obj \
|
|
gdkcursor-win32.obj \
|
|
gdkdnd-win32.obj \
|
|
gdkdisplay-win32.obj \
|
|
gdkdrawable-win32.obj \
|
|
gdkevents-win32.obj \
|
|
gdkfont-win32.obj \
|
|
gdkgc-win32.obj \
|
|
gdkgeometry-win32.obj \
|
|
gdkglobals-win32.obj \
|
|
gdkim-win32.obj \
|
|
gdkimage-win32.obj \
|
|
gdkinput.obj \
|
|
gdkinput-win32.obj \
|
|
gdkkeys-win32.obj \
|
|
gdkmain-win32.obj \
|
|
gdkpango-win32.obj \
|
|
gdkpixmap-win32.obj \
|
|
gdkproperty-win32.obj \
|
|
# gdkregion-win32.obj \
|
|
gdkscreen-win32.obj \
|
|
gdkselection-win32.obj \
|
|
gdkvisual-win32.obj \
|
|
gdkwin32id.obj \
|
|
gdkwindow-win32.obj
|
|
|
|
..\..\config.h : ..\..\config.h.win32
|
|
copy ..\..\config.h.win32 ..\..\config.h
|
|
|
|
..\gdkconfig.h : ..\gdkconfig.h.win32
|
|
copy ..\gdkconfig.h.win32 ..\gdkconfig.h
|
|
|
|
gdk.res : rc\gdk.rc
|
|
rc -DBUILDNUMBER=0 -r -fo gdk.res rc\gdk.rc
|
|
|
|
gdk-win32.lib : $(gdk_win32_OBJECTS)
|
|
lib -out:gdk-win32.lib $(gdk_win32_OBJECTS)
|
|
|
|
.c.obj :
|
|
$(CC) $(CFLAGS) -GD -c -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $<
|
|
|
|
clean::
|
|
del *.obj
|
|
del *.lib
|
|
del *.err
|
|
del *.res
|