Wb build xttgraph, Ge journal question removed

wb/lib/wb/gtk/wb_wnav_gtk.cpp

@@ -256,14 +256,14 @@ void WNavGtk::create_popup_menu( pwr_tAttrRef aref, int x, int y)
   (create_popup_menu_cb)( parent_ctx, aref, x, y);
 }
 
-Ge *WNavGtk::ge_new( char *graph_name)
+Ge *WNavGtk::ge_new( char *graph_name, int nojournal)
 {
-  unsigned int options;
+  unsigned int options = 0;
 
   if ( gbl.enable_comment)
-    options = ge_mOption_EnableComment;
-  else
-    options = 0;
+    options |= ge_mOption_EnableComment;
+  if ( nojournal)
+    options |= ge_mOption_IgnoreJournal;
 
   GeGtk *ge = new GeGtk( NULL, toplevel, ldhses, 0, options, graph_name);
   return ge;

wb/lib/wb/gtk/wb_wnav_gtk.h

@@ -73,7 +73,7 @@ class WNavGtk : public WNav {
     void set_inputfocus( int focus);
     void trace_start();
     void set_selection_owner();
-    Ge *ge_new( char *graph_name);
+    Ge *ge_new( char *graph_name, int nojournal);
     WGe *wge_new( char *name, char *filename, char *object_name,
 		  int modal);
     void create_popup_menu( pwr_tAttrRef aref, int x, int y);

wb/lib/wb/motif/wb_wnav_motif.cpp

@@ -263,14 +263,14 @@ void WNavMotif::create_popup_menu( pwr_tAttrRef aref, int x, int y)
   wnav_set_avoid_deadlock( this, 2000);
 }
 
-Ge *WNavMotif::ge_new( char *graph_name)
+Ge *WNavMotif::ge_new( char *graph_name, int nojournal)
 {
-  unsigned int options;
+  unsigned int options = 0;
 
   if ( gbl.enable_comment)
-    options = ge_mOption_EnableComment;
-  else
-    options = 0;
+    options |= ge_mOption_EnableComment;
+  if ( nojournal)
+    options |= ge_mOption_IgnoreJournal;
 
   GeMotif *ge = new GeMotif( NULL, parent_wid, ldhses, 0, options, graph_name);
   return ge;

wb/lib/wb/motif/wb_wnav_motif.h

@@ -72,7 +72,7 @@ class WNavMotif : public WNav {
     void set_inputfocus( int focus);
     void trace_start();
     void set_selection_owner();
-    Ge *ge_new( char *graph_name);
+    Ge *ge_new( char *graph_name, int nojournal);
     WGe *wge_new( char *name, char *filename, char *object_name,
 		  int modal);
     void create_popup_menu( pwr_tAttrRef aref, int x, int y);

wb/lib/wb/src/wb_build.cpp

@@ -731,7 +731,7 @@ void wb_build::xttgraph( pwr_tOid oid)
 	MsgWindow::message('W', cmd, msgw_ePop_No, oid);
       }
       else {
-	Ge *gectx = m_wnav->ge_new( action);
+	Ge *gectx = m_wnav->ge_new( action, 1);
 	strcpy( cmd, "export java");
 	m_sts = gectx->command( cmd);
 	if ( evenSts()) {
@@ -861,7 +861,7 @@ void wb_build::webgraph( pwr_tOid oid)
       MsgWindow::message('W', cmd, msgw_ePop_No, oid);
     }
     else {
-      Ge *gectx = m_wnav->ge_new( graph_name);
+      Ge *gectx = m_wnav->ge_new( graph_name, 1);
       strcpy( cmd, "export java");
       m_sts = gectx->command( cmd);
       if ( evenSts()) {

wb/lib/wb/src/wb_c_classdef.cpp

@@ -75,7 +75,7 @@ static pwr_tStatus OpenObjectGraph (
   if ( EVEN(sts)) return sts;
 
   cdh_ToLower( name, name);
-  ip->wnav->ge_new( name);
+  ip->wnav->ge_new( name, 0);
   return PWRS__SUCCESS;
 }
 

wb/lib/wb/src/wb_wnav.h

@@ -317,7 +317,7 @@ class WNav : public WUtility{
     virtual void set_inputfocus( int focus) {}
     virtual void trace_start() {}
     virtual void set_selection_owner() {}
-    virtual Ge *ge_new( char *graph_name) { return 0;}
+    virtual Ge *ge_new( char *graph_name, int nojournal) { return 0;}
     virtual WGe *wge_new( char *name, char *filename, char *object_name,
 			  int modal) { return 0;}
     virtual void create_popup_menu( pwr_tAttrRef aref, int x, int y) {}

xtt/lib/ge/gtk/ge_graph_gtk.cpp

@@ -66,9 +66,10 @@ GraphGtk::GraphGtk(
 	int xn_gdh_init_done,
 	const char *xn_object_name,
 	int xn_use_default_access,
-	unsigned int xn_default_access) :
+	unsigned int xn_default_access,
+	unsigned int xn_options) :
   Graph( xn_parent_ctx, xn_name, xn_default_path, graph_mode, xn_gdh_init_done, xn_object_name,
-	 xn_use_default_access), parent_wid(xn_parent_wid)
+	 xn_use_default_access, xn_default_access, xn_options), parent_wid(xn_parent_wid)
 {
   default_access = xn_default_access;
   if ( scrollbar) {

xtt/lib/ge/gtk/ge_graph_gtk.h

@@ -74,7 +74,8 @@ class GraphGtk : public Graph {
 	int xn_gdh_init_done = 0,
 	const char *xn_object_name = 0,
 	int xn_use_default_access = 0,
-	unsigned int xn_default_access = 0);
+	unsigned int xn_default_access = 0,
+	unsigned int xn_options = 0);
 
   void trace_timer_remove();
   void trace_timer_add( int time);

xtt/lib/ge/gtk/ge_gtk.cpp

@@ -2934,9 +2934,10 @@ GeGtk::GeGtk( 	void 	*x_parent_ctx,
 
   // Graph component
   int sts;
+  unsigned int opt = x_options & ge_mOption_IgnoreJournal ? graph_mOption_IgnoreJournal : 0;
 
   graph = new GraphGtk( this, GTK_WIDGET(toplevel), "GraphGtk", &grow_widget, &sts, "pwrp_pop:",
-			graph_eMode_Development, 1);
+			graph_eMode_Development, 1, 0, 0, 0, 0, opt);
   graph->message_cb = &Ge::message_cb;
   graph->get_current_subgraph_cb = &Ge::subpalette_get_select;
   graph->get_current_colors_cb = &Ge::colorpalette_get_current;

xtt/lib/ge/motif/ge_graph_motif.cpp

@@ -78,9 +78,10 @@ GraphMotif::GraphMotif(
 	int xn_gdh_init_done,
 	const char *xn_object_name,
 	int xn_use_default_access,
-	unsigned int xn_default_access) :
+	unsigned int xn_default_access,
+	unsigned int xn_options) :
   Graph( xn_parent_ctx, xn_name, xn_default_path, graph_mode, xn_gdh_init_done, xn_object_name,
-	 xn_use_default_access), parent_wid(xn_parent_wid)
+	 xn_use_default_access, xn_default_access, xn_options), parent_wid(xn_parent_wid)
 {
   default_access = xn_default_access;
   if ( scrollbar)

xtt/lib/ge/motif/ge_graph_motif.h

@@ -72,7 +72,8 @@ class GraphMotif : public Graph {
 	int xn_gdh_init_done = 0,
 	const char *xn_object_name = 0,
 	int xn_use_default_access = 0,
-	unsigned int xn_default_access = 0);
+	unsigned int xn_default_access = 0,
+	unsigned int xn_options = 0);
 
   void trace_timer_remove();
   void trace_timer_add( int time);

xtt/lib/ge/motif/ge_motif.cpp

@@ -1569,8 +1569,11 @@ GeMotif::GeMotif( 	void 	*x_parent_ctx,
   XtManageChild( ge_widget);
   XtUnmanageChild( cmd_input);
 
+  unsigned int opt = x_options & ge_mOption_IgnoreJournal ? graph_mOption_IgnoreJournal : 0;
+
   graph = new GraphMotif( this, graph_form, "",
-		&grow_widget, &sts, "pwrp_pop:");
+			  &grow_widget, &sts, "pwrp_pop:", graph_eMode_Development, 
+			  1, 0, 0, 0, 0, opt);
   graph->message_cb = &Ge::message_cb;
   graph->get_current_subgraph_cb = &Ge::subpalette_get_select;
   graph->get_current_colors_cb = &Ge::colorpalette_get_current;

xtt/lib/ge/src/ge.h

@@ -69,7 +69,8 @@ typedef void *GlowCtx;
 /* ge.h -- Simple graphic editor */
 
 typedef enum {
-  ge_mOption_EnableComment = 1
+  ge_mOption_EnableComment = 1 << 0,
+  ge_mOption_IgnoreJournal = 1 << 1
 } ge_mOption;
 
 typedef struct {

xtt/lib/ge/src/ge_graph.cpp

@@ -155,7 +155,8 @@ Graph::Graph(
 	int xn_gdh_init_done,
 	const char *xn_object_name,
 	int xn_use_default_access,
-	unsigned int xn_default_access) :
+	unsigned int xn_default_access,
+	unsigned int xn_options) :
 	attr_list( 0, NULL),
 	parent_ctx(xn_parent_ctx),
 	grow(0), grow_cnt(0), ldhses(0), journal(0),
@@ -198,7 +199,7 @@ Graph::Graph(
   strcpy( systemname, "");
 
   // Create journal file
-  if ( mode == graph_eMode_Development) {
+  if ( mode == graph_eMode_Development && !(xn_options & graph_mOption_IgnoreJournal)) {
     int sts;
 
     journal = new GraphJournal( this, &sts);

xtt/lib/ge/src/ge_graph.h

@@ -108,6 +108,10 @@ typedef enum {
   graph_eMode_Runtime		//!< Runtime mode.
 } graph_eMode;
 
+typedef enum {
+  graph_mOption_IgnoreJournal = 1 << 0
+} graph_mOption;
+
 //! Databases
 typedef enum {
   graph_eDatabase_Gdh,		//!< Database rtdb.
@@ -422,7 +426,8 @@ class Graph {
 	int xn_gdh_init_done = 0,
 	const char *xn_object_name = 0,
 	int xn_use_default_access = 0,
-	unsigned int xn_default_access = 0);
+	unsigned int xn_default_access = 0,
+	unsigned int xn_options = 0);
 
   virtual void trace_timer_remove() {}
   virtual void trace_timer_add( int time) {}