changes to use new XmHTML widget

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@211 57a11ea4-9604-0410-9ed3-97b8803252fd

src/HelpWindow.c

@@ -43,13 +43,11 @@
 #include "main.h"
 #include "util.h"
 
-#define HAVE_XMHTML 1
-
-#if HAVE_HTMLW
+#if USE_HTMLW
 #include "HTML.h"
 #endif 
 
-#if HAVE_XMHTML
+#if USE_XMHTML
 #include "XmHTML.h"
 #endif 
 
@@ -188,7 +186,7 @@ static void   helpAnchorCB( Widget mw, XtPointer cd, XtPointer cb );
 
 char      *htmlRead( char *file );
 
-#if HAVE_XMHTML
+#if USE_XMHTML
 void xaccJumpToLabel (Widget mw, char *jumpfile);
 #endif 
 
@@ -257,7 +255,7 @@ helpWindow( Widget parent, char *title, char *htmlfile )
     
     helpwidget =
       XtVaCreateManagedWidget( "help",
-#if HAVE_HTMLW
+#if USE_HTMLW
 			       htmlWidgetClass,         controlform,
 #if HAVE_XPM
 			       WbNresolveImageFunction, htmlResolveImage,
@@ -265,7 +263,7 @@ helpWindow( Widget parent, char *title, char *htmlfile )
 			       WbNdelayImageLoads,      False,
 #endif 
 
-#if HAVE_XMHTML
+#if USE_XMHTML
                                xmHTMLWidgetClass,       controlform,
                                XmNanchorButtons,        False, 
 #endif 
@@ -277,10 +275,10 @@ helpWindow( Widget parent, char *title, char *htmlfile )
 			       XmNheight,               400,
 			       NULL );
     
-#if HAVE_HTMLW
+#if USE_HTMLW
     XtAddCallback( helpwidget, WbNanchorCallback, helpAnchorCB, NULL );
 #endif 
-#if HAVE_XMHTML
+#if USE_XMHTML
     XtAddCallback( helpwidget, XmNactivateCallback, helpAnchorCB, NULL );
 #endif
     
@@ -341,10 +339,10 @@ helpWindow( Widget parent, char *title, char *htmlfile )
     
     /* we have to load the page after the widget is realized, so
      * the pictures can be drawn  ?? but its not realized yet! */
-#if HAVE_HTMLW
+#if USE_HTMLW
     XtVaSetValues( helpwidget, WbNtext, htmlRead(htmlfile), NULL );
 #endif
-#ifdef HAVE_XMHTML
+#ifdef USE_XMHTML
     xaccJumpToLabel( helpwidget, htmlfile );
 #endif
 
@@ -364,10 +362,10 @@ helpWindow( Widget parent, char *title, char *htmlfile )
     }
   /* if help window is already open, just load new page */
   else {
-#if HAVE_HTMLW
+#if USE_HTMLW
     XtVaSetValues( helpwidget, WbNtext, htmlRead(htmlfile), NULL );
 #endif
-#ifdef HAVE_XMHTML
+#ifdef USE_XMHTML
     xaccJumpToLabel( helpwidget, htmlfile );
 #endif
     }
@@ -393,10 +391,10 @@ helpBackCB( Widget mw, XtPointer cd, XtPointer cb )
   char *file = historyBack(&helpHistory);
   if( file != NULL )
     {
-#if HAVE_HTMLW
+#if USE_HTMLW
     XtVaSetValues( helpwidget, WbNtext, htmlRead(file), NULL );
 #endif
-#ifdef HAVE_XMHTML
+#ifdef USE_XMHTML
     xaccJumpToLabel( helpwidget, file );
 #endif
     }
@@ -417,10 +415,10 @@ helpFwdCB( Widget mw, XtPointer cd, XtPointer cb )
   char *file = historyFwd(&helpHistory);
   if( file != NULL )
     {
-#if HAVE_HTMLW
+#if USE_HTMLW
     XtVaSetValues( helpwidget, WbNtext, htmlRead(file), NULL );
 #endif
-#ifdef HAVE_XMHTML
+#ifdef USE_XMHTML
     xaccJumpToLabel( helpwidget, file );
 #endif
     }
@@ -452,7 +450,7 @@ closeHelpWin( Widget mw, XtPointer cd, XtPointer cb )
 static void
 helpAnchorCB( Widget mw, XtPointer cd, XtPointer cb )
   {
-#if HAVE_HTMLW
+#if USE_HTMLW
   WbAnchorCallbackData *acbs = (WbAnchorCallbackData *)cb;
   fprintf(stderr,"%d %s\n",acbs->element_id, acbs->text);
 
@@ -464,7 +462,7 @@ helpAnchorCB( Widget mw, XtPointer cd, XtPointer cb )
     }
 #endif
 
-#ifdef HAVE_XMHTML
+#ifdef USE_XMHTML
    XmHTMLAnchorCallbackStruct *acbs = (XmHTMLAnchorCallbackStruct *) cb;
 
    if(acbs->reason != XmCR_ACTIVATE) return;
@@ -507,7 +505,7 @@ helpAnchorCB( Widget mw, XtPointer cd, XtPointer cb )
  *     utility functions...                                         * 
 \********************************************************************/
 
-#if HAVE_XMHTML
+#if USE_XMHTML
 void
 xaccJumpToLabel (Widget mw, char *jumpfile)
 {

src/Makefile.in

@@ -30,8 +30,9 @@ CC       = @CC@
 INCLPATH = -I.. \
            -I@x_includes@ \
            -I@srcdir@/../include \
-           -I@srcdir@/../lib/libhtmlw \
-           -I@srcdir@/../lib/ComboBox-1.33
+           -I@srcdir@/../lib/ComboBox-1.33 \
+           -I@srcdir@/../lib/XmHTML-1.1.0/src
+#           -I@srcdir@/../lib/libhtmlw 
 CFLAGS   = @cflags@
 LFLAGS   = @lflags@
 LIBS     = @LIBS@
@@ -39,6 +40,7 @@ LIBPATH  = -L@x_libraries@
 TARGET   = ../xacc
 
 LIBHTMLW = ../lib/libhtmlw/libhtmlw.a
+LIBXMHTML= ../lib/XmHTML-1.1.0/libXmHTML.a
 LIBXBAE  = ../lib/Xbae-4.6.2-linas/libXbae.a
 LIBCOMBO = ../lib/ComboBox-1.33/libComboBox.a
 ######################################################################
@@ -47,7 +49,8 @@ SRCS = AccWindow.c Account.c AccountMenu.c Action.c AdjBWindow.c    \
        LedgerUtils.c MainWindow.c PopBox.c QIFIO.c QuickFill.c      \
        RecnWindow.c RegWindow.c Reports.c TextBox.c Transaction.c   \
        XferBox.c XferWindow.c date.c main.c util.c
-OBJS = ${SRCS:.c=.o} $(LIBHTMLW) $(LIBXBAE) $(LIBCOMBO)
+# OBJS = ${SRCS:.c=.o} $(LIBHTMLW) $(LIBXBAE) $(LIBCOMBO)
+OBJS = ${SRCS:.c=.o} $(LIBXMHTML) $(LIBXBAE) $(LIBCOMBO)
 ######################################################################
 
 default: $(TARGET)