Commit d142187b authored by Tor Lillqvist's avatar Tor Lillqvist
Browse files

Fixes to the win32 backend to actually be able to compile within a

directory hierarchy like this, with common gdk.h and gdktypes.h
for all backends. gdkrectangles.c and gdkrgb.c is copied before
compilation from the x11 backed (which still is in .., but
eventually will be in ..\x11).
parent 9f513b18
......@@ -33,12 +33,11 @@
#include <limits.h>
#include <io.h>
#include "gdk.h"
#include "gdkprivate.h"
#include "gdkinput.h"
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdki18n.h>
#include "gdkx.h"
#include "gdkkeysyms.h"
#include "gdki18n.h"
#include "gdkinput.h"
static void gdkx_XConvertCase (KeySym symbol,
KeySym *lower,
......@@ -2090,7 +2089,7 @@ gdk_keys_keyval_compare (const void *pkey, const void *pbase)
return (*(int *) pkey) - ((struct gdk_key *) pbase)->keyval;
}
const gchar*
gchar*
gdk_keyval_name (guint keyval)
{
struct gdk_key *found =
......
This diff is collapsed.
......@@ -64,8 +64,7 @@
#include <stdlib.h>
#include <string.h>
#include "gdk.h"
#include "gdkprivate.h"
#include "gdkx.h"
#define MAX_IMAGE_COLORS 256
......
......@@ -31,8 +31,6 @@
#include <string.h>
#include <time.h>
#include "gdk.h"
#include "gdkprivate.h"
#include "gdkx.h"
#ifdef _MSC_VER
......
......@@ -31,8 +31,6 @@
#include <string.h>
#include <time.h>
#include "gdk.h"
#include "gdkprivate.h"
#include "gdkx.h"
#ifdef _MSC_VER
......
/* Handcrafted for Win32 */
#define GDK_WINDOWING GDK_WINDOWING_WIN32
#define GDK_HAVE_WCHAR_H 1
#define GDK_HAVE_WCTYPE_H 1
......@@ -19,7 +19,7 @@
#include "config.h"
#include "gdk.h"
#include <gdk/gdk.h>
#include "gdkprivate.h"
static const struct { const char *name; int type; } cursors[] = {
......
......@@ -19,7 +19,7 @@
#include "config.h"
#include "gdk.h"
#include <gdk/gdk.h>
#include "gdkprivate.h"
static const struct { const char *name; int type; } cursors[] = {
......
......@@ -30,13 +30,14 @@
#define INITGUID
#include <string.h>
#include "gdk.h"
#include "gdkx.h"
#include "gdk/gdkprivate.h"
#include <ole2.h>
#include <shlobj.h>
#include <shlguid.h>
#include <gdk/gdk.h>
#include "gdkx.h"
typedef struct _GdkDragContextPrivate GdkDragContextPrivate;
typedef enum {
......
......@@ -30,13 +30,14 @@
#define INITGUID
#include <string.h>
#include "gdk.h"
#include "gdkx.h"
#include "gdk/gdkprivate.h"
#include <ole2.h>
#include <shlobj.h>
#include <shlguid.h>
#include <gdk/gdk.h>
#include "gdkx.h"
typedef struct _GdkDragContextPrivate GdkDragContextPrivate;
typedef enum {
......
......@@ -27,7 +27,7 @@
#include "config.h"
#include <math.h>
#include "gdk.h"
#include <gdk/gdk.h>
#include "gdkprivate.h"
#ifndef M_TWOPI
......
......@@ -27,7 +27,7 @@
#include "config.h"
#include <math.h>
#include "gdk.h"
#include <gdk/gdk.h>
#include "gdkprivate.h"
#ifndef M_TWOPI
......
......@@ -28,11 +28,10 @@
#include "config.h"
#include <stdio.h>
#include "gdk.h"
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
#include "gdkx.h"
#include "gdkprivate.h"
#include "gdkinput.h"
#include "gdkkeysyms.h"
#define PING() printf("%s: %d\n",__FILE__,__LINE__),fflush(stdout)
......
......@@ -28,11 +28,10 @@
#include "config.h"
#include <stdio.h>
#include "gdk.h"
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
#include "gdkx.h"
#include "gdkprivate.h"
#include "gdkinput.h"
#include "gdkkeysyms.h"
#define PING() printf("%s: %d\n",__FILE__,__LINE__),fflush(stdout)
......
......@@ -29,7 +29,7 @@
#include <stdio.h>
#include <ctype.h>
#include "gdk.h"
#include <gdk/gdk.h>
#include "gdkprivate.h"
GdkFont*
......
......@@ -29,7 +29,7 @@
#include <stdio.h>
#include <ctype.h>
#include "gdk.h"
#include <gdk/gdk.h>
#include "gdkprivate.h"
GdkFont*
......
......@@ -27,7 +27,7 @@
#include "config.h"
#include <string.h>
#include "gdk.h"
#include <gdk/gdk.h>
#include "gdkprivate.h"
GdkGC*
......
......@@ -27,7 +27,7 @@
#include "config.h"
#include <string.h>
#include "gdk.h"
#include <gdk/gdk.h>
#include "gdkprivate.h"
GdkGC*
......
......@@ -25,7 +25,7 @@
*/
#include <stdio.h>
#include "gdk.h"
#include <gdk/gdk.h>
#include "gdkprivate.h"
guint gdk_debug_flags = 0;
......
......@@ -25,7 +25,7 @@
*/
#include <stdio.h>
#include "gdk.h"
#include <gdk/gdk.h>
#include "gdkprivate.h"
guint gdk_debug_flags = 0;
......
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