Motif build

xtt/lib/ge/motif/ge_curve_motif.cpp

@@ -264,7 +264,8 @@ GeCurveMotif::GeCurveMotif( void 	*gc_parent_ctx,
 			    int gc_width,
 			    int gc_height,
 			    unsigned int gc_options) :
-  GeCurve( gc_parent_ctx, curve_name, filename, curve_data, pos_right, gc_options)
+  GeCurve( gc_parent_ctx, curve_name, filename, curve_data, pos_right, 
+	   gc_width, gc_height, gc_options)
 {
   char		uid_filename[120] = {"xtt_curve.uid"};
   char		*uid_filename_p = uid_filename;

xtt/lib/xtt/motif/xtt_ge_motif.cpp

@@ -296,7 +296,7 @@ void XttGeMotif::action_resize( Widget w, XmAnyCallbackStruct *data)
 XttGeMotif::~XttGeMotif()
 {
   if ( close_cb)
-    (close_cb)( this);
+    (close_cb)( parent_ctx, this);
   if ( set_focus_disabled)
     XtRemoveTimeOut( focus_timerid);
   delete graph;
@@ -314,11 +314,11 @@ XttGeMotif::XttGeMotif( Widget xg_parent_wid, void *xg_parent_ctx, const char *x
 			int xg_navigator, int xg_width, int xg_height, int x, int y, 
 			double scan_time, const char *object_name,
 			int use_default_access, unsigned int access, unsigned int options,
-			int (*xg_command_cb) (XttGe *, char *, void *),
+			int (*xg_command_cb) (void *, char *, void *),
 			int (*xg_get_current_objects_cb) (void *, pwr_sAttrRef **, int **),
 			int (*xg_is_authorized_cb) (void *, unsigned int)) :
   XttGe( xg_parent_ctx, xg_name, xg_filename, xg_scrollbar, xg_menu, xg_navigator, xg_width,
-	 xg_height, x, y, scan_time, object_name, use_default_access, access,
+	 xg_height, x, y, scan_time, object_name, use_default_access, access, options,
 	 xg_command_cb, xg_get_current_objects_cb, xg_is_authorized_cb), 
   parent_wid(xg_parent_wid), set_focus_disabled(0), focus_timerid(0)
 {

xtt/lib/xtt/motif/xtt_ge_motif.h

@@ -62,7 +62,7 @@ class XttGeMotif : public XttGe {
 	      int scrollbar, int menu, int navigator, int width, int height,
 	      int x, int y, double scan_time, const char *object_name, int use_default_access,
 	      unsigned int access, unsigned int options,
-	      int (*xg_command_cb) (XttGe *, char *, void *),
+	      int (*xg_command_cb) (void *, char *, void *),
 	      int (*xg_get_current_objects_cb) (void *, pwr_sAttrRef **, int **),
 	      int (*xg_is_authorized_cb) (void *, unsigned int));
   ~XttGeMotif();

xtt/lib/xtt/motif/xtt_xnav_motif.cpp

@@ -246,9 +246,9 @@ Ev *XNavMotif::ev_new( char *eve_name, char *ala_name, char *blk_name,
 		      display_return, display_ack, ev_beep, ev_pop_mask, ev_eventname_seg, status);
 }
 
-Hist *XNavMotif::hist_new( char *title, pwr_tOid oid, pwr_tStatus *sts)
+Hist *XNavMotif::hist_new( char *title, pwr_tAttrRef *arp, pwr_tStatus *sts)
 {
-  return new HistMotif( this, parent_wid, title, oid, sts);
+  return new HistMotif( this, parent_wid, title, arp, sts);
 }
 
 Block *XNavMotif::block_new( pwr_tAttrRef *arp, char *name, unsigned int priv,
@@ -292,7 +292,7 @@ XttGe *XNavMotif::xnav_ge_new( const char *name, const char *filename, int scrol
 			       int navigator, int width, int height, int x, int y, 
 			       double scan_time, const char *object_name, 
 			       int use_default_access, unsigned int access, unsigned int options,
-			       int (*command_cb) (XttGe *, char *),
+			       int (*command_cb) (void *, char *, void *),
 			       int (*get_current_objects_cb) (void *, pwr_sAttrRef **, int **),
 			       int (*is_authorized_cb) (void *, unsigned int))
 {
@@ -304,7 +304,7 @@ XttGe *XNavMotif::xnav_ge_new( const char *name, const char *filename, int scrol
 GeCurve *XNavMotif::gecurve_new( char *name, char *filename, GeCurveData *data,
 				 int pos_right, unsigned int options)
 {
-  return new GeCurveMotif( this, parent_wid, name, filename, data, pos_right, options);
+  return new GeCurveMotif( this, parent_wid, name, filename, data, pos_right, 0, 0, options);
 }
 
 CoLogin *XNavMotif::login_new( const char      	*name,

xtt/lib/xtt/motif/xtt_xnav_motif.h

@@ -69,7 +69,7 @@ class XNavMotif : public XNav {
 		pwr_tObjid ev_user, int display_ala, int display_eve,
 		int display_blk, int display_return, int display_ack,
 		int ev_beep, pwr_tMask ev_pop_mask, int ev_eventname_seg, pwr_tStatus *status);
-    Hist *hist_new( char *title, pwr_tOid oid, pwr_tStatus *sts);
+    Hist *hist_new( char *title, pwr_tAttrRef *arp, pwr_tStatus *sts);
     Block *block_new( pwr_tAttrRef *arp, char *name, unsigned int priv,
 		      pwr_tStatus *sts);
     Op *op_new( char *opplace, pwr_tStatus *sts);
@@ -85,11 +85,11 @@ class XNavMotif : public XNav {
 			int navigator, int width, int height, int x, int y, 
 			double scan_time, const char *object_name, 
 			int use_default_access, unsigned int access, unsigned int options,
-			int (*xg_command_cb) (XttGe *, char *),
+			int (*xg_command_cb) (void *, char *, void *),
 			int (*xg_get_current_objects_cb) (void *, pwr_sAttrRef **, int **),
 			int (*xg_is_authorized_cb) (void *, unsigned int));
     GeCurve *gecurve_new( char *name, char *filename, GeCurveData *data,
-			  unsigned int options, int pos_right);
+			  int pos_right, unsigned int options);
     CoLogin *login_new( const char     	*wl_name,
 			const char     	*wl_groupname,
 			void		(* wl_bc_success)( void *),