aboutsummaryrefslogtreecommitdiff
path: root/libXaw/src
diff options
context:
space:
mode:
Diffstat (limited to 'libXaw/src')
-rw-r--r--libXaw/src/Label.c2
-rw-r--r--libXaw/src/Pixmap.c4
-rw-r--r--libXaw/src/TextAction.c4
-rw-r--r--libXaw/src/Vendor.c2
-rw-r--r--libXaw/src/makefile53
5 files changed, 63 insertions, 2 deletions
diff --git a/libXaw/src/Label.c b/libXaw/src/Label.c
index d58442699..5ce3b7dca 100644
--- a/libXaw/src/Label.c
+++ b/libXaw/src/Label.c
@@ -671,7 +671,7 @@ _Reposition(LabelWidget lw, unsigned int width, unsigned int height,
*dx = newPos - lw->label.label_x;
lw->label.label_x = newPos;
- newPos = (height - lw->label.label_height) >> 1;
+ newPos = ((int)(height - lw->label.label_height)) >> 1;
*dy = newPos - lw->label.label_y;
lw->label.label_y = newPos;
}
diff --git a/libXaw/src/Pixmap.c b/libXaw/src/Pixmap.c
index e4ac9b4bb..b1718b50f 100644
--- a/libXaw/src/Pixmap.c
+++ b/libXaw/src/Pixmap.c
@@ -748,7 +748,11 @@ BitmapLoader(XawParams *params, Screen *screen, Colormap colormap, int depth,
if (params->name[0] != '/' && params->name[0] != '.')
{
if (!sub[0].substitution)
+ #ifdef _MSC_VER
+ sub[0].substitution = ".";
+ #else
sub[0].substitution = getenv("HOME");
+ #endif
sub[1].substitution = params->name;
if (pixmap_path == NULL)
GetResourcePixmapPath(DisplayOfScreen(screen));
diff --git a/libXaw/src/TextAction.c b/libXaw/src/TextAction.c
index 6705316d3..772f08d12 100644
--- a/libXaw/src/TextAction.c
+++ b/libXaw/src/TextAction.c
@@ -36,6 +36,7 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xatom.h>
#include <X11/Xfuncs.h>
#include <X11/Xutil.h>
+#include <X11/Xwinsock.h>
#include <X11/Xmu/Atoms.h>
#include <X11/Xmu/Misc.h>
#include <X11/Xmu/StdSel.h>
@@ -60,6 +61,9 @@ in this Software without prior written authorization from The Open Group.
#define XawTextActionMaxHexChars 100
+#ifdef _MSC_VER
+#define usleep(time) Sleep(time)
+#endif
/*
* Prototypes
*/
diff --git a/libXaw/src/Vendor.c b/libXaw/src/Vendor.c
index b45589092..c73d17fe7 100644
--- a/libXaw/src/Vendor.c
+++ b/libXaw/src/Vendor.c
@@ -134,7 +134,7 @@ unsigned long _DLL_InitTerm(unsigned long mod,unsigned long flag)
}
#endif
-#if defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(__CYGWIN__) || defined(__MINGW32__) && !defined(_MSC_VER)
int __stdcall
DllMain(unsigned long mod_handle, unsigned long flag, void *routine)
{
diff --git a/libXaw/src/makefile b/libXaw/src/makefile
new file mode 100644
index 000000000..b0dde1df9
--- /dev/null
+++ b/libXaw/src/makefile
@@ -0,0 +1,53 @@
+LIBRARY = libXaw
+INCLUDES := .. ../include ../include/X11 $(INCLUDES)
+
+DEFINES += XT_NO_SM
+
+CSRCS = \
+ Actions.c \
+ AllWidgets.c \
+ AsciiSink.c \
+ AsciiSrc.c \
+ AsciiText.c \
+ Box.c \
+ Command.c \
+ Converters.c \
+ Dialog.c \
+ DisplayList.c \
+ Form.c \
+ Grip.c \
+ Label.c \
+ List.c \
+ MenuButton.c \
+ MultiSrc.c \
+ MultiSink.c \
+ OS.c \
+ Paned.c \
+ Panner.c \
+ Pixmap.c \
+ Porthole.c \
+ Repeater.c \
+ Scrollbar.c \
+ Simple.c \
+ SimpleMenu.c \
+ Sme.c \
+ SmeBSB.c \
+ SmeLine.c \
+ StripChart.c \
+ Text.c \
+ TextSink.c \
+ TextSrc.c \
+ TextAction.c \
+ TextPop.c \
+ TextTr.c \
+ Toggle.c \
+ Tree.c \
+ Vendor.c \
+ Viewport.c \
+ XawIm.c \
+ XawInit.c \
+ XawI18n.c \
+ Tip.c
+
+
+DEFINES += XAW7