aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-18 22:33:59 +0000
committermarha <marha@users.sourceforge.net>2011-01-18 22:33:59 +0000
commit34fa09ac6d7c1864f3d3c0c3d4ccc3d02fe6ead4 (patch)
tree52be7cd4d42c84113bc583618d372b73c822c874
parent06141f7a37054b5a53f09287e7ad0f5c8619a2d7 (diff)
downloadvcxsrv-34fa09ac6d7c1864f3d3c0c3d4ccc3d02fe6ead4.tar.gz
vcxsrv-34fa09ac6d7c1864f3d3c0c3d4ccc3d02fe6ead4.tar.bz2
vcxsrv-34fa09ac6d7c1864f3d3c0c3d4ccc3d02fe6ead4.zip
Solved problem of app icon not being loaded
-rw-r--r--apps/xcalc/makefile2
-rw-r--r--apps/xcalc/xcalc.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/xcalc/makefile b/apps/xcalc/makefile
index 5288e202d..905eceb4b 100644
--- a/apps/xcalc/makefile
+++ b/apps/xcalc/makefile
@@ -3,7 +3,6 @@ WINAPP = xcalc
DEFINES += XT_NO_SM IEEE
INCLUDELIBFILES = \
- $(MHMAKECONF)\libXt\src\$(OBJDIR)\libXt.lib \
$(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \
$(MHMAKECONF)\libX11\src\xcms\$(OBJDIR)\libxcms.lib \
$(MHMAKECONF)\libx11\src\xlibi18n\$(OBJDIR)\libi18n.lib \
@@ -17,6 +16,7 @@ INCLUDELIBFILES = \
$(MHMAKECONF)\libxpm\src\$(OBJDIR)\libxpm.lib \
$(MHMAKECONF)\libxau\$(OBJDIR)\libxau.lib \
$(MHMAKECONF)\libXaw\src\$(OBJDIR)\libXaw.lib \
+ $(MHMAKECONF)\libXt\src\$(OBJDIR)\libXt.lib \
$(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \
$(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \
$(MHMAKECONF)\libX11\src\$(OBJDIR)\libX11.lib
diff --git a/apps/xcalc/xcalc.c b/apps/xcalc/xcalc.c
index 39547377c..d51034156 100644
--- a/apps/xcalc/xcalc.c
+++ b/apps/xcalc/xcalc.c
@@ -117,6 +117,8 @@ main(int argc, char **argv)
XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
+ XawInitializeWidgetSet(); // Needed to have the string to bitmap conversion function initialised
+
toplevel = XtAppInitialize(&xtcontext, "XCalc", Options, XtNumber(Options),
&argc, argv, NULL, NULL, 0);
if (argc != 1) Syntax(argc, argv);