Release-1.5.1-20070107

1 files changed, 14 insertions, 32 deletions

diff --git a/src/config.l b/src/config.l
index 1c1dae7..19d3c1e 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
@@ -1145,7 +1145,7 @@ void Config::check()
 
 #undef PUTENV
 #undef SEP
-#if defined(_WIN32) && (__BORLANDC__ < 0x0550)
+#if defined(_WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ < 0x0550))
 #define PUTENV _putenv
 #define SEP ";"
 #else 
@@ -1167,11 +1167,13 @@ void Config::check()
     PUTENV(buf);
   }
 
+#if 0
   int &depth = Config_getInt("MAX_DOT_GRAPH_DEPTH");
   if (depth==0)
   {
     depth=1000;
   }
+#endif
   
   if (Config_getBool("OPTIMIZE_OUTPUT_JAVA") && Config_getBool("INLINE_INFO"))
   {
@@ -2751,38 +2753,18 @@ void Config::create()
   cl->setWidgetType(ConfigList::Dir);
   cl->addDependency("HAVE_DOT");
   ci = addInt(
-                    "MAX_DOT_GRAPH_WIDTH",
-                    "The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width \n"
-                    "(in pixels) of the graphs generated by dot. If a graph becomes larger than \n"
-                    "this value, doxygen will try to truncate the graph, so that it fits within \n"
-                    "the specified constraint. Beware that most browsers cannot cope with very \n"
-                    "large images. \n",
-                    100,30000, 1024
-                );
-  ci->addDependency("HAVE_DOT");
-  ci = addInt(
-                    "MAX_DOT_GRAPH_HEIGHT",
-                    "The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height \n"
-                    "(in pixels) of the graphs generated by dot. If a graph becomes larger than \n"
-                    "this value, doxygen will try to truncate the graph, so that it fits within \n"
-                    "the specified constraint. Beware that most browsers cannot cope with very \n"
-                    "large images. \n",
-                    100,30000,1024
-                );
-  ci = addInt(
-                    "MAX_DOT_GRAPH_DEPTH",
-                    "The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the \n"
-                    "graphs generated by dot. A depth value of 3 means that only nodes reachable \n"
-                    "from the root by following a path via at most 3 edges will be shown. Nodes \n"
-		    "that lay further from the root node will be omitted. Note that setting this \n"
-		    "option to 1 or 2 may greatly reduce the computation time needed for large \n"
-		    "code bases. Also note that a graph may be further truncated if the graph's \n"
-		    "image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH \n"
-		    "and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), \n"
-		    "the graph is not depth-constrained. \n",
-                    0,1000,0
+                    "DOT_GRAPH_MAX_NODES",
+                    "The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of \n"
+                    "nodes that will be shown in the graph. If the number of nodes in a graph \n"
+                    "becomes larger than this value, doxygen will truncate the graph, which is \n"
+                    "visualized by representing a node as a red box. Note that doxygen will always \n"
+                    "show the root nodes and its direct children regardless of this setting. \n",
+                    0,10000, 50
                 );
   ci->addDependency("HAVE_DOT");
+  addObsolete("MAX_DOT_GRAPH_WIDTH");
+  addObsolete("MAX_DOT_GRAPH_HEIGHT");
+  addObsolete("MAX_DOT_GRAPH_DEPTH");
   cb = addBool(
                     "DOT_TRANSPARENT",
 		    "Set the DOT_TRANSPARENT tag to YES to generate images with a transparent \n"