tk.git - Tk is a free and open-source, cross-platform widget toolkit that provides a library of basic elements of GUI widgets for building a graphical user interface (GUI) in many programming languages.

Tk is a free and open-source, cross-platform widget toolkit that provides a library of basic elements of GUI widgets for building a graphical user interface (GUI) in many programming languages.

summary refs log tree commit diff stats

path: root/generic/tkPanedWindow.c

	Commit message (Expand)	Author	Age	Files	Lines
*	* tests/panedwindow.test: panedwindow-25.1	hobbs	2004-05-03	1	-1/+13

*	Private functions should be either static or prefixed with 'Tk' (thanks GPS!)	dkf	2003-09-29	1	-3/+3

*	* generic/tkPanedWindow.c(PanedWindowWorldChanged):	jenglish	2003-08-19	1	-2/+3

*	Fix for [Bug 702230], and an evil bug it is too!	dkf	2003-07-18	1	-1/+9

*	* generic/tkPanedWindow.c (ArrangePanes): Ensure that the last pane	hobbs	2003-07-17	1	-3/+9

*	The panedwindow widget now sizes right around unmapped windows. [Bug 738143]	dkf	2003-05-21	1	-3/+10

*	Use the panedwindow's depth, not the screen's default depth. [Bug #671122]	dkf	2003-02-21	1	-5/+3

*	* tests/panedwindow.test:	hobbs	2003-02-21	1	-3/+6

*	Fixed calculation of the last slave's	pspjuth	2003-02-20	1	-5/+3

*	* generic/tkPanedWindow.c (Tk_PanedWindowObjCmd): leave the	hobbs	2002-10-08	1	-7/+13

*	* tests/panedwindow.test: added panedwindow-28.[12]	hobbs	2002-09-30	1	-3/+3

*	* generic/tkPanedWindow.c (Tk_PanedWindowObjCmd):	hobbs	2002-08-08	1	-2/+2

*	Made panedwindow tests all work again; I'm fairly sure the current behaviour ...	dkf	2002-08-06	1	-6/+17

*	Stopped a potential core dump from happening when a idle event outlives its c...	dkf	2002-08-02	1	-2/+5

*	Postpone paned-window layout arrangement on geometry event until idle,	dkf	2002-07-31	1	-3/+6

*	* tests/panedwindow.test:	hobbs	2002-06-19	1	-61/+7

*	* generic/tkPanedWindow.c (DestroyPanedWindow, ConfigureSlaves):	hobbs	2002-04-12	1	-3/+7

*	* generic/tkPanedWindow.c (PanedWindowWidgetObjCmd): fixed returns	hobbs	2002-02-22	1	-12/+17

*	TIP #41 implementation, panedwindow [Patch #512503] (melski)	hobbs	2002-02-22	1	-0/+2780

flag \n";

+ t << "# controls if a separate .chi index file is generated (YES) or that \n";

+ t << "# it should be included in the master .chm file (NO).\n";

+ t << "\n";

+ }

+ t << "GENERATE_CHI = ";

+ writeBoolValue(t,Config::htmlHelpChiFlag);

+ t << "\n";

+ if (!sl)

+ {

+ t << "\n";

t << "# The DISABLE_INDEX tag can be used to turn on/off the condensed index at \n";

t << "# top of each HTML page. The value NO (the default) enables the index and \n";

t << "# the value YES disables it. \n";

@@ -2251,6 +2270,17 @@ void writeTemplateConfig(QFile *f,bool sl)

if (!sl)

{

t << "\n";

+ t << "# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will \n";

+ t << "# remove the intermedate dot files that are used to generate \n";

+ t << "# the various graphs. \n";

+ t << "\n";

+ }

+ t << "DOT_CLEANUP = ";

+ writeBoolValue(t,Config::dotCleanUp);

+ t << "\n";

+ if (!sl)

+ {

+ t << "\n";

}

t << "#---------------------------------------------------------------------------\n";

t << "# Configuration::addtions related to the search engine \n";

diff --git a/src/definition.cpp b/src/definition.cpp
index b068d79..ebd126c 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp

@@ -141,7 +141,7 @@ void Definition::setBriefDescription(const char *b)

}

/*! Reads a fragment of code from file \a fileName starting at

- * line \a startLine and ending at line \a endLine. The fragment is

+ * line \a startLine and ending at line \a endLine (inclusive). The fragment is

* stored in \a result. If FALSE is returned the code fragment could not be

* found.

*

@@ -201,10 +201,15 @@ static bool readCodeFragment(const char *fileName,

}

if (found)

{

- // fill the line with spaces until the right column

- QCString spaces;

- spaces.fill(' ',col);

- result+=spaces;

+ // For code with more than one line,

+ // fill the line with spaces until we are at the right column

+ // so that the opening brace lines up with the closing brace

+ if (endLine!=startLine)

+ {

+ QCString spaces;

+ spaces.fill(' ',col);

+ result+=spaces;

+ }

// copy until end of line

result+=c;

if (c==':') result+=cn;

@@ -221,15 +226,16 @@ static bool readCodeFragment(const char *fileName,

} while (size_read == (maxLineLength-1));

lineNr++;

- } while (lineNr<endLine && !f.atEnd());

+ } while (lineNr<=endLine && !f.atEnd());

- int charIndex = result.findRev('}');

- if (charIndex > 0)

+ // strip stuff after closing bracket

+ int newLineIndex = result.findRev('\n');

+ int braceIndex = result.findRev('}');

+ if (braceIndex > newLineIndex)

{

- result.truncate(charIndex+1);

- result+='\n';

+ result.truncate(braceIndex+1);

}

- endLine=lineNr;

+ endLine=lineNr-1;

return TRUE;

}

}

diff --git a/src/doc.l b/src/doc.l
index 5c449b3..efeb291 100644
--- a/src/doc.l
+++ b/src/doc.l

@@ -472,8 +472,12 @@ static void endBlock()

{

outDoc->endDescTableData();

outDoc->endDescTable();

+ outDoc->endParamList();

+ }

+ else

+ {

+ outDoc->endDescList();

}

- outDoc->endDescList();

currentListIndent.pop();

inParamBlock=inRetValBlock=inSeeBlock=inReturnBlock=inAuthorBlock=

inVersionBlock=inSinceBlock=inDateBlock=inBugBlock=inNoteBlock=inWarningBlock=

@@ -1037,7 +1041,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

}

BEGIN(DocPar);

}

-<DocPar>[^\n]*{BN} {

+<DocPar>[^\n]*{BN}+ {

QCString title=QCString(yytext).stripWhiteSpace();

bool b = inBlock();

if (!title.isEmpty())

@@ -1059,7 +1063,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

}

BEGIN(DocScan);

}

-<DocScan>{CMD}"warning"/{BN} {

+<DocScan>{CMD}"warning"{BN}+ {

endArgumentList();

if (!inWarningBlock)

{

@@ -1078,7 +1082,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->writeDescItem();

}

}

-<DocScan>{CMD}"remark"[s]?/{BN} {

+<DocScan>{CMD}"remark"[s]?{BN}+ {

endArgumentList();

if (!inRemarkBlock)

{

@@ -1097,7 +1101,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->writeDescItem();

}

}

-<DocScan>{CMD}"attention"[s]?/{BN} {

+<DocScan>{CMD}"attention"{BN}+ {

endArgumentList();

if (!inAttentionBlock)

{

@@ -1116,7 +1120,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->writeDescItem();

}

}

-<DocScan>{CMD}"bug"[s]?/{BN} {

+<DocScan>{CMD}"bug"[s]?{BN}+ {

endArgumentList();

if (!inBugBlock)

{

@@ -1135,7 +1139,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->writeDescItem();

}

}

-<DocScan>{CMD}"note"[s]?/{BN} {

+<DocScan>{CMD}"note"[s]?{BN}+ {

endArgumentList();

if (!inNoteBlock)

{

@@ -1154,7 +1158,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->writeDescItem();

}

}

-<DocScan>{CMD}"pre"/{BN} {

+<DocScan>{CMD}"pre"{BN}+ {

endArgumentList();

if (!inPreBlock)

{

@@ -1173,7 +1177,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->writeDescItem();

}

}

-<DocScan>{CMD}"post"/{BN} {

+<DocScan>{CMD}"post"{BN}+ {

endArgumentList();

if (!inPostBlock)

{

@@ -1192,7 +1196,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->writeDescItem();

}

}

-<DocScan>{CMD}"invariant"/{BN} {

+<DocScan>{CMD}"invariant"{BN}+ {

endArgumentList();

if (!inInvarBlock)

{

@@ -1211,7 +1215,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->writeDescItem();

}

}

-<DocScan>{CMD}"version"/{BN} {

+<DocScan>{CMD}"version"{BN}+ {

endArgumentList();

if (!inVersionBlock)

{

@@ -1230,7 +1234,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->writeDescItem();

}

}

-<DocScan>{CMD}"since"/{BN} {

+<DocScan>{CMD}"since"{BN}+ {

endArgumentList();

if (!inSinceBlock)

{

@@ -1249,7 +1253,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->writeDescItem();

}

}

-<DocScan>{CMD}"date"/{BN} {

+<DocScan>{CMD}"date"{BN}+ {

endArgumentList();

if (!inDateBlock)

{

@@ -1312,7 +1316,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

currentListIndent.pop();

}

}

-<DocScan>{CMD}"deprecated"/{BN} {

+<DocScan>{CMD}"deprecated"{BN}+ {

endArgumentList();

if (!inDeprecatedBlock)

{

@@ -1350,7 +1354,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->endDescList();

currentListIndent.pop();

}

-<DocScan>{CMD}"author"/{BN} {

+<DocScan>{CMD}"author"{BN}+ {

endArgumentList();

if (!inAuthorBlock)

{

@@ -1369,7 +1373,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->docify(", ");

}

}

-<DocScan>{CMD}("return"([s])?|"result")/{BN} {

+<DocScan>{CMD}("return"([s])?|"result"){BN}+ {

endArgumentList();

if (!inReturnBlock)

{

@@ -1384,7 +1388,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->writeDescItem();

}

}

-<DocScan>{CMD}("sa"|"see")/{BN} {

+<DocScan>{CMD}("sa"|"see"){BN}+ {

endArgumentList();

if (!inSeeBlock)

{

@@ -1403,7 +1407,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

outDoc->docify(", ");

}

}

-<DocScan>(({B}*"\n"){2,}{B}*)?{CMD}"param"/{BN} {

+<DocScan>(({B}*"\n"){2,}{B}*)?{CMD}"param"{BN}+ {

QCString t=yytext;

if (t.contains('\n')>1 && insideItemList)

{

@@ -1415,7 +1419,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

if (inBlock()) endBlock();

inParamBlock=TRUE;

currentListIndent.push("D");

- outDoc->startDescList();

+ outDoc->startParamList();

outDoc->startBold();

scanString(theTranslator->trParameters()+": ");

outDoc->endBold();

@@ -1429,7 +1433,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

}

BEGIN(DocParam);

}

-<DocScan>(({B}*"\n"){2,}{B}*)?{CMD}"retval"/{BN} {

+<DocScan>(({B}*"\n"){2,}{B}*)?{CMD}"retval"{BN}+ {

QCString t=yytext;

if (t.contains('\n')>1 && insideItemList)

{

@@ -1441,7 +1445,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

if (inBlock()) endBlock();

inRetValBlock=TRUE;

currentListIndent.push("D");

- outDoc->startDescList();

+ outDoc->startParamList();

outDoc->startBold();

scanString(theTranslator->trReturnValues()+": ");

outDoc->endBold();

@@ -1455,7 +1459,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

}

BEGIN(DocParam);

}

-<DocScan>(({B}*"\n"){2,}{B}*)?{CMD}("exception"|"throw")s?/{BN} {

+<DocScan>(({B}*"\n"){2,}{B}*)?{CMD}("exception"|"throw")s?{BN}+ {

QCString t=yytext;

if (t.contains('\n')>1 && insideItemList)

{

@@ -1467,7 +1471,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

if (inBlock()) endBlock();

inExceptionBlock=TRUE;

currentListIndent.push("D");

- outDoc->startDescList();

+ outDoc->startParamList();

outDoc->startBold();

scanString(theTranslator->trExceptions()+": ");

outDoc->endBold();

@@ -1482,10 +1486,10 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})

BEGIN(DocException);

}

<DocScan>"\\capt".*

-<DocParam>({DOCPARAM}{BN}*","{BN}*)*{DOCPARAM} {

+<DocParam>({DOCPARAM}{BN}*","{BN}*)*{DOCPARAM}{BN}* {

outDoc->startDescTableTitle();

outDoc->startEmphasis();

- outDoc->docify(substitute(yytext,"\"",""));

+ outDoc->docify(substitute(yytext,"\"","").stripWhiteSpace());

outDoc->endEmphasis();

outDoc->endDescTableTitle();

outDoc->startDescTableData();

diff --git a/src/dot.cpp b/src/dot.cpp
index 5824794..7b3309c 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp

@@ -602,7 +602,7 @@ void DotGfxHierarchyTable::writeGraph(QTextStream &out,const char *path)

out << "<map name=\"" << n->m_label << "_map\">" << endl;

convertMapFile(out,mapName);

out << "</map>" << endl;

- thisDir.remove(dotName);

+ if (Config::dotCleanUp) thisDir.remove(dotName);

thisDir.remove(mapName);

}

out << "</table>" << endl;

@@ -1187,7 +1187,7 @@ void DotClassGraph::writeGraph(QTextStream &out,

"\\end{center}\n"

"\\end{figure}\n";

}

- thisDir.remove(baseName+".dot");

+ if (Config::dotCleanUp) thisDir.remove(baseName+".dot");

QDir::setCurrent(oldDir);

}

@@ -1387,7 +1387,7 @@ void DotInclDepGraph::writeGraph(QTextStream &out,

"\\end{figure}\n";

}

- thisDir.remove(baseName+".dot");

+ if (Config::dotCleanUp) thisDir.remove(baseName+".dot");

QDir::setCurrent(oldDir);

}

diff --git a/src/doxygen.cpp b/src/doxygen.cpp