AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved include for Windows compilation; minor doc tweaks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2002-01-08 14:15:57 +00:00
parent ef338f9a93
commit d7d176241e
9 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/menu.tex
View File

@ -777,7 +777,7 @@ Redraw the menu bar
\func{wxMenu *}{Remove}{\param{size\_t }{pos}}
Removes the menu from the menu bar and returns the menu object - the caller is
reposnbile for deleting it. This function may be used together with
responsible for deleting it. This function may be used together with
\helpref{wxMenuBar::Insert}{wxmenubarinsert} to change the menubar
dynamically.

4
docs/latex/wx/window.tex
View File

@ -1602,7 +1602,9 @@ Most, but not all, windows respond to this event.
\func{void}{OnSize}{\param{wxSizeEvent\& }{event}}
Called when the window has been resized.
Called when the window has been resized. This is not a virtual function; you should
provide your own non-virtual OnSize function and direct size events to it using EVT\_SIZE
in an event table definition.
\wxheading{Parameters}

5
samples/dialogs/dialogs.cpp
View File

@ -42,9 +42,10 @@
#include <wx/generic/fontdlgg.h>
#endif
#define wxUSE_DIRDLGG 1
#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
// New wxGenericDirCtrl
#include "wx/dirctrl.h"
#include "wx/generic/dirdlgg.h"
#endif
#include "dialogs.h"

2
src/generic/dirdlgg.cpp
View File

@ -29,12 +29,12 @@
#include "wx/textctrl.h"
#include "wx/button.h"
#include "wx/sizer.h"
#include "wx/statline.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/msgdlg.h"
#endif
#include "wx/statline.h"
#include "wx/generic/dirctrlg.h"
#include "wx/generic/dirdlgg.h"

1
utils/tex2rtf/docs/tex2rtf.tex
View File

@ -685,6 +685,7 @@ The default is white.}
the generation of separate HTML files below section level. This can reduce the
number of HTML files substantially. A subsection contents list is inserted before
the first subsection.}
\twocolitem{\inioption{htmlFaceName}}{A string specifying the overall font face, such as ``"Arial, Lucida, Helvetica".}
\end{twocollist}
\section{DDE commands}\index{DDE}%

39
utils/tex2rtf/src/htmlutil.cpp
View File

@ -181,7 +181,7 @@ void ReopenFile(FILE **fd, char **fileName)
{
if (*fd)
{
fprintf(*fd, "\n</BODY></HTML>\n");
fprintf(*fd, "\n</FONT></BODY></HTML>\n");
fclose(*fd);
}
fileId ++;
@ -583,6 +583,17 @@ char *ParseColourString(char *bkStr, bool *isPicture)
else return NULL;
}
void OutputFont(void)
{
// Output <FONT FACE=...>
TexOutput("<FONT FACE=\"");
if (htmlFaceName)
TexOutput(htmlFaceName);
else
TexOutput("Times New Roman");
TexOutput("\">\n");
}
// Output start of <BODY> block
void OutputBodyStart(void)
{
@ -637,6 +648,8 @@ void OutputBodyStart(void)
}
}
TexOutput(">\n");
OutputFont();
}
// Called on start/end of macro examination
@ -1027,7 +1040,8 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
if (inTabular)
{
// End cell, start cell
TexOutput("</TD>");
TexOutput("</FONT></TD>");
// Start new row and cell, setting alignment for the first cell.
if (currentColumn < noColumns)
@ -1051,6 +1065,7 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
else
sprintf(buf, "\n<TD ALIGN=LEFT>");
TexOutput(buf);
OutputFont();
}
else
TexOutput("&amp;");
@ -1099,12 +1114,13 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
else
sprintf(buf, "<TR>\n<TD ALIGN=LEFT>");
TexOutput(buf);
OutputFont();
}
else
{
// End cell and row
// Start new row and cell
TexOutput("</TD>\n</TR>\n");
TexOutput("</FONT></TD>\n</TR>\n");
}
break;
}
@ -2114,8 +2130,9 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
TexOutput(buf);
} else
TexOutput("\n<TR><TD VALIGN=TOP>\n");
OutputFont();
} else
TexOutput("\n</TD>\n");
TexOutput("\n</FONT></TD>\n");
}
if (arg_no == 2)
{
@ -2127,8 +2144,9 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
TexOutput(buf);
} else
TexOutput("\n<TD VALIGN=TOP>\n");
OutputFont();
} else
TexOutput("\n</TD></TR>\n");
TexOutput("\n</FONT></TD></TR>\n");
}
return TRUE;
break;
@ -2630,6 +2648,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
if (compatibilityMode)
{
TexOutput("<TR>\n<TD>");
OutputFont();
/*
for (int i = 0; i < noColumns; i++)
{
@ -2909,25 +2928,25 @@ bool HTMLGo(void)
if (Chapters)
{
fprintf(Chapters, "\n</BODY></HTML>\n");
fprintf(Chapters, "\n</FONT></BODY></HTML>\n");
fclose(Chapters);
Chapters = NULL;
}
if (Sections)
{
fprintf(Sections, "\n</BODY></HTML>\n");
fprintf(Sections, "\n</FONT></BODY></HTML>\n");
fclose(Sections);
Sections = NULL;
}
if (Subsections && !combineSubSections)
{
fprintf(Subsections, "\n</BODY></HTML>\n");
fprintf(Subsections, "\n</FONT></BODY></HTML>\n");
fclose(Subsections);
Subsections = NULL;
}
if (Subsubsections && !combineSubSections)
{
fprintf(Subsubsections, "\n</BODY></HTML>\n");
fprintf(Subsubsections, "\n</FONT></BODY></HTML>\n");
fclose(Subsubsections);
Subsubsections = NULL;
}
@ -2995,7 +3014,7 @@ bool HTMLGo(void)
fclose(fd);
}
fprintf(tmpTitle, "\n</BODY>\n");
fprintf(tmpTitle, "\n</FONT></BODY>\n");
if (htmlFrameContents)
{

1
utils/tex2rtf/src/tex2any.cpp
View File

@ -145,6 +145,7 @@ char *followedLinkColourString = NULL;
bool combineSubSections = FALSE;
bool htmlWorkshopFiles = FALSE;
bool ignoreBadRefs = FALSE;
char *htmlFaceName = copystring("Times New Roman");
extern int passNumber;

1
utils/tex2rtf/src/tex2any.h
View File

@ -249,6 +249,7 @@ extern char *followedLinkColourString; // HTML followed link colour
extern bool combineSubSections; // Stop splitting files below section
extern bool htmlWorkshopFiles; // generate HTML Help Workshop project files
extern bool ignoreBadRefs; // Don't insert (REF NOT FOUND)
extern char *htmlFaceName; // HTML face name
// Names to help with internationalisation
extern char *ContentsNameString;

5
utils/tex2rtf/src/texutils.cpp
View File

@ -1185,6 +1185,11 @@ char *RegisterSetting(char *settingName, char *settingValue, bool interactive)
upperCaseNames = StringTobool(settingValue);
else if (StringMatch(settingName, "ignoreBadRefs", FALSE, TRUE))
ignoreBadRefs = StringTobool(settingValue);
else if (StringMatch(settingName, "htmlFaceName", FALSE, TRUE))
{
delete[] htmlFaceName;
htmlFaceName = copystring(settingValue);
}
else if (StringMatch(settingName, "winHelpTitle", FALSE, TRUE))
{
if (winHelpTitle)