forked from AuroraMiddleware/gtk
Include gdkprivate.h withouh gdk/ path, as it shouldn't be in the common
* gtk/simple.c gtk/makeenums.h: Include gdkprivate.h withouh gdk/ path, as it shouldn't be in the common gdk directory. * gtk/gtkcompat.h.win32: New file. * gtk/gtkfeatures.h.win32: Removed. * gtk/makefile.msc: Make gtkcompat.h from gtkcompat.h.win32. Use gdk library from correct (../gdk/win32) directory.
This commit is contained in:
Tor Lillqvist
parent
0b4d29fd6e
commit
f3e95348be
105
gtk/gtkcompat.h.win32
Normal file
105
gtk/gtkcompat.h.win32
Normal file
@ -0,0 +1,105 @@
|
||||
/* GTK - The GIMP Toolkit
|
||||
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library 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
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
|
||||
* file for a list of people on the GTK+ Team. See the ChangeLog
|
||||
* files for a list of changes. These files are distributed with
|
||||
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
||||
*/
|
||||
|
||||
#ifndef __GTK_COMPAT_H__
|
||||
#define __GTK_COMPAT_H__
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
|
||||
/* compile time version
|
||||
*/
|
||||
#define GTK_MAJOR_VERSION (1)
|
||||
#define GTK_MINOR_VERSION (3)
|
||||
#define GTK_MICRO_VERSION (0)
|
||||
#define GTK_BINARY_AGE (0)
|
||||
#define GTK_INTERFACE_AGE (0)
|
||||
|
||||
/* check whether a Gtk+ version equal to or greater than
|
||||
* major.minor.micro is present.
|
||||
*/
|
||||
#define GTK_CHECK_VERSION(major,minor,micro) \
|
||||
(GTK_MAJOR_VERSION > (major) || \
|
||||
(GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION > (minor)) || \
|
||||
(GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \
|
||||
GTK_MICRO_VERSION >= (micro)))
|
||||
|
||||
|
||||
/* use -DGTK_DISABLE_COMPAT_H to compile your code and asure that it
|
||||
* works with future Gtk+ versions as well.
|
||||
*/
|
||||
#ifndef GTK_DISABLE_COMPAT_H
|
||||
|
||||
/* the following are aliases that have to be kept for historical
|
||||
* reasons, because a wide code base depends on them. it is not
|
||||
* recommended to actually make use of these definitions.
|
||||
*/
|
||||
#define gtk_accel_label_accelerator_width gtk_accel_label_get_accel_width
|
||||
#define gtk_container_border_width gtk_container_set_border_width
|
||||
#define gtk_notebook_current_page gtk_notebook_get_current_page
|
||||
#define gtk_packer_configure gtk_packer_set_child_packing
|
||||
#define gtk_paned_gutter_size gtk_paned_set_gutter_size
|
||||
#define gtk_paned_handle_size gtk_paned_set_handle_size
|
||||
#define gtk_scale_value_width gtk_scale_get_value_width
|
||||
#define gtk_window_position gtk_window_set_position
|
||||
#define gtk_toggle_button_set_state gtk_toggle_button_set_active
|
||||
#define gtk_check_menu_item_set_state gtk_check_menu_item_set_active
|
||||
|
||||
|
||||
/* strongly deprecated, very likely to be removed in the future:
|
||||
*/
|
||||
#define gtk_ctree_set_reorderable(t,r) gtk_clist_set_reorderable((GtkCList*) (t),(r))
|
||||
#define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) gtk_style_apply_default_background (s,gw,1,st,a,x,y,w,h)
|
||||
#define GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS 1-0-1
|
||||
#define GTK_HAVE_SIGNAL_INIT 1-0-2
|
||||
#define GTK_HAVE_FEATURES_1_1_0 1-1-0
|
||||
#define GTK_HAVE_FEATURES_1_1_2 1-1-2
|
||||
#define GTK_HAVE_FEATURES_1_1_4 1-1-4
|
||||
#define GTK_HAVE_FEATURES_1_1_5 1-1-5
|
||||
#define GTK_HAVE_FEATURES_1_1_6 1-1-6
|
||||
#define GTK_HAVE_FEATURES_1_1_7 1-1-7
|
||||
#define GTK_HAVE_FEATURES_1_1_8 1-1-8
|
||||
#define GTK_HAVE_FEATURES_1_1_9 1-1-9
|
||||
#define GTK_HAVE_FEATURES_1_1_10 1-1-10
|
||||
#define GTK_HAVE_FEATURES_1_1_11 1-1-11
|
||||
#define GTK_HAVE_FEATURES_1_1_12 1-1-12
|
||||
#define GTK_HAVE_FEATURES_1_1_13 1-1-13
|
||||
#define GTK_HAVE_FEATURES_1_1_14 1-1-14
|
||||
|
||||
|
||||
#endif /* GTK_DISABLE_COMPAT_H */
|
||||
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
|
||||
#endif /* __GTK_COMPAT_H__ */
|
||||
@ -1,117 +0,0 @@
|
||||
/* GTK - The GIMP Toolkit
|
||||
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library 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
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library 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_FEATURES_H__
|
||||
#define __GTK_FEATURES_H__
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
|
||||
/* compile time version
|
||||
*/
|
||||
#define GTK_MAJOR_VERSION (1)
|
||||
#define GTK_MINOR_VERSION (3)
|
||||
#define GTK_MICRO_VERSION (0)
|
||||
#define GTK_BINARY_AGE (0)
|
||||
#define GTK_INTERFACE_AGE (0)
|
||||
|
||||
/* new gtk_container_set_focus_[hv]adjustment()
|
||||
*/
|
||||
#define GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS 1-0-1
|
||||
|
||||
/* newly exported gtk_signal_init()
|
||||
* new gtk_signal_n_emissions*()
|
||||
* "signal-name" is now an alias for "signal_name"
|
||||
* new gtk_signal_emitv*()
|
||||
*/
|
||||
#define GTK_HAVE_SIGNAL_INIT 1-0-2
|
||||
|
||||
/* Gtk+ 1.1.0 version tag.
|
||||
* - new gtk_rc_set_image_loader () to install custom image loaders for rc
|
||||
* files.
|
||||
* - GtkAccel groups replaced GtkAcceleratorTables
|
||||
* - Gdk supports full crossing event now.
|
||||
* - Buttons featur relief styles now.
|
||||
* - gdk_rgb_*() functions are in place.
|
||||
* - stringified enum values can be queried for enum types now.
|
||||
* - new key binding system is in place (GtkBindingSet).
|
||||
* - simple algorithm for pattern matching is exported now (GtkPatternSpec).
|
||||
*/
|
||||
#define GTK_HAVE_FEATURES_1_1_0 1-1-0
|
||||
|
||||
/* Gtk+ 1.1.2 version tag
|
||||
* - ctree function name changes
|
||||
*/
|
||||
#define GTK_HAVE_FEATURES_1_1_2 1-1-2
|
||||
|
||||
/* Gtk+ 1.1.4 version tag
|
||||
* - clist v/hscrollbar -> v/hadjustment changes
|
||||
*/
|
||||
#define GTK_HAVE_FEATURES_1_1_4 1-1-4
|
||||
|
||||
/* Gtk+ 1.1.5 version tag
|
||||
*/
|
||||
#define GTK_HAVE_FEATURES_1_1_5 1-1-5
|
||||
|
||||
/* Gtk+ 1.1.6 version tag
|
||||
*/
|
||||
#define GTK_HAVE_FEATURES_1_1_6 1-1-6
|
||||
|
||||
/* Gtk+ 1.1.7 version tag
|
||||
*/
|
||||
#define GTK_HAVE_FEATURES_1_1_7 1-1-7
|
||||
|
||||
/* Gtk+ 1.1.8 version tag
|
||||
*/
|
||||
#define GTK_HAVE_FEATURES_1_1_8 1-1-8
|
||||
|
||||
/* Gtk+ 1.1.9 version tag
|
||||
*/
|
||||
#define GTK_HAVE_FEATURES_1_1_9 1-1-9
|
||||
|
||||
/* Gtk+ 1.1.10 version tag
|
||||
*/
|
||||
#define GTK_HAVE_FEATURES_1_1_10 1-1-10
|
||||
|
||||
/* Gtk+ 1.1.11 version tag
|
||||
*/
|
||||
#define GTK_HAVE_FEATURES_1_1_11 1-1-11
|
||||
|
||||
/* Gtk+ 1.1.12 version tag
|
||||
*/
|
||||
#define GTK_HAVE_FEATURES_1_1_12 1-1-12
|
||||
|
||||
/* Gtk+ 1.1.13 version tag
|
||||
* gtk_toggle_button_set_state name changes
|
||||
*/
|
||||
#define GTK_HAVE_FEATURES_1_1_13 1-1-13
|
||||
|
||||
/* Gtk+ 1.1.14 version tag
|
||||
* working gtk layout, etc
|
||||
*/
|
||||
#define GTK_HAVE_FEATURES_1_1_14 1-1-14
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
|
||||
#endif /* __GTK_FEATURES_H__ */
|
||||
@ -1,5 +1,5 @@
|
||||
#include <gdk/gdk.h>
|
||||
#include <gdk/gdkprivate.h>
|
||||
#include <gdkprivate.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <gtk/gtkprivate.h>
|
||||
#include <gtk/gtkdebug.h>
|
||||
|
||||
@ -38,14 +38,14 @@ TOUCH = copy makefile.msc+nul
|
||||
GLIB_VER=1.2
|
||||
GTK_VER=1.3
|
||||
|
||||
GDK = ..\gdk
|
||||
GDKSYSDEP = ..\gdk\win32
|
||||
GLIB = ..\..\glib-$(GLIB_VER)
|
||||
|
||||
CFLAGS = -I. -I.. -I..\gdk\win32 -I$(GLIB) -I$(GLIB)\gmodule -DGTK_DISABLE_COMPAT_H
|
||||
CFLAGS = -I. -I.. -I$(GDKSYSDEP) -I$(GLIB) -I$(GLIB)\gmodule -DGTK_DISABLE_COMPAT_H
|
||||
|
||||
all : \
|
||||
..\config.h \
|
||||
gtkfeatures.h \
|
||||
gtkcompat.h \
|
||||
generated \
|
||||
gtk-$(GTK_VER).dll\
|
||||
testdnd.exe \
|
||||
@ -53,7 +53,6 @@ all : \
|
||||
testinput.exe \
|
||||
testrgb.exe \
|
||||
testselection.exe \
|
||||
testthreads.exe \
|
||||
simple.exe
|
||||
|
||||
install : all
|
||||
@ -289,8 +288,8 @@ gdk_headers = \
|
||||
..\config.h : ..\config.h.win32
|
||||
copy ..\config.h.win32 ..\config.h
|
||||
|
||||
gtkfeatures.h : gtkfeatures.h.win32
|
||||
copy gtkfeatures.h.win32 gtkfeatures.h
|
||||
gtkcompat.h : gtkcompat.h.win32
|
||||
copy gtkcompat.h.win32 gtkcompat.h
|
||||
|
||||
#
|
||||
# Generated source files:
|
||||
@ -330,7 +329,7 @@ gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
|
||||
# Linking:
|
||||
#
|
||||
gtk-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def
|
||||
$(CC) $(CFLAGS) -LD -Fegtk-$(GTK_VER).dll $(gtk_OBJECTS) $(MEMCHECKLIB) $(GDK)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib gdi32.lib user32.lib $(LDFLAGS) /def:gtk.def
|
||||
$(CC) $(CFLAGS) -LD -Fegtk-$(GTK_VER).dll $(gtk_OBJECTS) $(MEMCHECKLIB) $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib gdi32.lib user32.lib $(LDFLAGS) /def:gtk.def
|
||||
|
||||
# General rule for compiling the objects into the DLL
|
||||
.c.obj :
|
||||
@ -340,44 +339,44 @@ gtk-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def
|
||||
# Test programs:
|
||||
#
|
||||
testdnd.exe : testdnd.obj
|
||||
$(CC) $(CFLAGS) testdnd.obj gtk-$(GTK_VER).lib $(GDK)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
$(CC) $(CFLAGS) testdnd.obj gtk-$(GTK_VER).lib $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
|
||||
# Must have separate rules for these objects that don't go in the DLL
|
||||
testdnd.obj : testdnd.c
|
||||
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testdnd\" testdnd.c
|
||||
|
||||
testgtk.exe : testgtk.obj
|
||||
$(CC) $(CFLAGS) testgtk.obj $(MEMCHECKLIB) gtk-$(GTK_VER).lib $(GDK)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
$(CC) $(CFLAGS) testgtk.obj $(MEMCHECKLIB) gtk-$(GTK_VER).lib $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
|
||||
testgtk.obj : testgtk.c
|
||||
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgtk\" testgtk.c
|
||||
|
||||
testinput.exe : testinput.obj
|
||||
$(CC) $(CFLAGS) testinput.obj gtk-$(GTK_VER).lib $(GDK)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
$(CC) $(CFLAGS) testinput.obj gtk-$(GTK_VER).lib $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
|
||||
testinput.obj : testinput.c
|
||||
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testinput\" testinput.c
|
||||
|
||||
testrgb.exe : testrgb.obj
|
||||
$(CC) $(CFLAGS) testrgb.obj gtk-$(GTK_VER).lib $(GDK)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
$(CC) $(CFLAGS) testrgb.obj gtk-$(GTK_VER).lib $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
|
||||
testrgb.obj : testrgb.c
|
||||
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testrgb\" testrgb.c
|
||||
|
||||
testselection.exe : testselection.obj
|
||||
$(CC) $(CFLAGS) testselection.obj gtk-$(GTK_VER).lib $(GDK)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
$(CC) $(CFLAGS) testselection.obj gtk-$(GTK_VER).lib $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
|
||||
testselection.obj : testselection.c
|
||||
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testselection\" testselection.c
|
||||
|
||||
testthreads.exe : testthreads.obj
|
||||
$(CC) $(CFLAGS) testthreads.obj gtk-$(GTK_VER).lib $(GDK)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gthread-$(GLIB_VER).lib $(PTHREAD_LIB) $(LDFLAGS)
|
||||
$(CC) $(CFLAGS) testthreads.obj gtk-$(GTK_VER).lib $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gthread-$(GLIB_VER).lib $(PTHREAD_LIB) $(LDFLAGS)
|
||||
|
||||
testthreads.obj : testthreads.c
|
||||
$(CC) $(CFLAGS) -I$(PTHREAD_INC) -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c
|
||||
|
||||
simple.exe : simple.obj
|
||||
$(CC) $(CFLAGS) simple.obj gtk-$(GTK_VER).lib $(GDK)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
$(CC) $(CFLAGS) simple.obj gtk-$(GTK_VER).lib $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
|
||||
simple.obj : simple.c
|
||||
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"simple\" simple.c
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdkprivate.h>
|
||||
#include <gdkprivate.h>
|
||||
|
||||
|
||||
void
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdkprivate.h>
|
||||
#include <gdkprivate.h>
|
||||
|
||||
|
||||
void
|
||||
|
||||
Loading…
Reference in New Issue
Block a user