dtcm: make it build

[oweals/cde.git] / cde / lib / DtHelp / HelpDialog.c

diff --git a/cde/lib/DtHelp/HelpDialog.c b/cde/lib/DtHelp/HelpDialog.c
index 47fffd6050eb79bb26ca2c5610ef59faf576afd1..3fdc57dd28b1e09ecad6660276d4430fe408be58 100644 (file)
--- a/cde/lib/DtHelp/HelpDialog.c
+++ b/cde/lib/DtHelp/HelpDialog.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -65,6 +65,7 @@
 #include <Xm/SeparatoG.h>
 #include <Xm/CascadeB.h>
 #include <Xm/CascadeBG.h>
+#include <Xm/XmPrivate.h>
 
 /* Copied from Xm/GeoUtilsI.h */
 extern XmGeoMatrix _XmGeoMatrixAlloc( 
@@ -81,6 +82,7 @@ extern XmGeoMatrix _XmGeoMatrixAlloc(
 #include "AccessI.h"
 #include "ActionsI.h"
 #include "DisplayAreaI.h"
+#include "DisplayAreaP.h"
 
 #include <Dt/Help.h>
 #include "HelpI.h"
@@ -750,7 +752,7 @@ static void Initialize(
   VariableInitialize(hw);
 
 
-  /* Validate the incomming arguments to make sure they are ok */
+  /* Validate the incoming arguments to make sure they are ok */
 
 
   /* Build the Menus bar */
@@ -877,7 +879,7 @@ static Boolean SetValues(
   Boolean updateRequest=FALSE;
   Boolean newTitle=FALSE;
 
-  /* Validate the incomming arguments to make sure they are ok */
+  /* Validate the incoming arguments to make sure they are ok */
 
 
 
@@ -1080,9 +1082,9 @@ static void MenuBarFix(
     XmGeoMajorLayout layoutPtr,
     XmKidGeometry rowPtr )
 {
-    register Dimension       marginW ;
-    register Dimension       marginH ;
-    register Dimension       twoMarginW ;
+    Dimension       marginW ;
+    Dimension       marginH ;
+    Dimension       twoMarginW ;
 
 
     marginW = geoSpec->margin_w ;
@@ -1144,8 +1146,8 @@ XmGeoMatrix _DtHelpDialogWidgetGeoMatrixCreate(
 
              DtHelpDialogWidget hw = (DtHelpDialogWidget) wid ;
              XmGeoMatrix     geoSpec ;
-    register XmGeoRowLayout  layoutPtr ;
-    register XmKidGeometry   boxPtr ;
+    XmGeoRowLayout  layoutPtr ;
+    XmKidGeometry   boxPtr ;
 
     geoSpec = _XmGeoMatrixAlloc( TB_MAX_WIDGETS_VERT, TB_MAX_NUM_WIDGETS, 0) ;
     geoSpec->composite = (Widget) hw ;
@@ -2121,7 +2123,6 @@ void _DtHelpUpdateDisplayArea(
    char          *userErrorStr=NULL;
    char          *sysErrorStr=NULL;
    char          *tmpMsg=NULL;
-   char                 *retTitle;
    XmString      labelString;
    Arg          args[10];
    int          n=0;
@@ -2819,7 +2820,7 @@ static void  ProcessJumpReuse(
        hw->help_dialog.ghelp.volumeFlag = FALSE;
      }
  
-    /* Free old copy fisrt ??? */
+    /* Free old copy first ??? */
     pTempLocationId = _DtHelpParseIdString(hyperData->specification);
     XtFree(hw->help_dialog.display.locationId);
     hw->help_dialog.display.locationId = pTempLocationId;
@@ -3089,7 +3090,7 @@ static void CloseHelpCB (
        callDataInfo.locationId = NULL;
        callDataInfo.helpVolume = NULL;
        callDataInfo.specification = NULL;
-       callDataInfo.hyperType = NULL;
+       callDataInfo.hyperType = 0;
    
        
        /* All we do is envoke the applications close callback */