Mercurial > dwindows
comparison dw.h @ 2862:7479ab54e014
Linux: Fixes for building dwtestoo on Linux/gcc.
GTK cannot be included in an extern "C" section.
Make sure ARCH is not set on platforms other than MacOS.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Thu, 15 Dec 2022 14:44:48 +0000 |
parents | 2934b2fdcd8e |
children | 939fbceec13f |
comparison
equal
deleted
inserted
replaced
2861:ef7a414f9b71 | 2862:7479ab54e014 |
---|---|
1229 /* Array of item structures */ | 1229 /* Array of item structures */ |
1230 struct _item *items; | 1230 struct _item *items; |
1231 } Box; | 1231 } Box; |
1232 | 1232 |
1233 #else | 1233 #else |
1234 | |
1235 /* GTK Cannot be included in an extern "C" section */ | |
1236 #ifdef __cplusplus | |
1237 } | |
1238 #endif | |
1239 | |
1234 /* GTK Specific section */ | 1240 /* GTK Specific section */ |
1241 #ifndef _GNU_SOURCE | |
1235 #define _GNU_SOURCE | 1242 #define _GNU_SOURCE |
1243 #endif | |
1236 #include <gtk/gtk.h> | 1244 #include <gtk/gtk.h> |
1237 #if GTK_MAJOR_VERSION < 4 | 1245 #if GTK_MAJOR_VERSION < 4 |
1238 #ifdef GDK_WINDOWING_X11 | 1246 #ifdef GDK_WINDOWING_X11 |
1239 # include <gdk/gdkx.h> | 1247 # include <gdk/gdkx.h> |
1240 #else | 1248 #else |
1241 # include <gdk/gdk.h> | 1249 # include <gdk/gdk.h> |
1242 #endif | 1250 #endif |
1243 #include <gdk/gdkprivate.h> | 1251 #include <gdk/gdkprivate.h> |
1244 #endif | 1252 #endif |
1245 #include <gdk/gdkkeysyms.h> | 1253 #include <gdk/gdkkeysyms.h> |
1254 | |
1255 #ifdef __cplusplus | |
1256 extern "C" { | |
1257 #endif | |
1258 | |
1246 #include <pthread.h> | 1259 #include <pthread.h> |
1247 #if !defined(GDK_WINDOWING_WIN32) | |
1248 # include <dlfcn.h> | 1260 # include <dlfcn.h> |
1249 #endif | |
1250 | 1261 |
1251 #define DW_DT_LEFT 1 | 1262 #define DW_DT_LEFT 1 |
1252 #define DW_DT_UNDERSCORE (1 << 1) | 1263 #define DW_DT_UNDERSCORE (1 << 1) |
1253 #define DW_DT_STRIKEOUT (1 << 2) | 1264 #define DW_DT_STRIKEOUT (1 << 2) |
1254 #define DW_DT_CENTER (1 << 3) | 1265 #define DW_DT_CENTER (1 << 3) |