Moved include for Windows compilation; minor doc tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/menu.tex b/docs/latex/wx/menu.tex
index 33946872fee8f9430838c52a48e7bc3fc31d09cb..47c25c0dd6c5f520b4a9bd9dc4e9694dbfcbe93a 100644 (file)
--- a/docs/latex/wx/menu.tex
+++ b/docs/latex/wx/menu.tex
@@ -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
 \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.
 
 \helpref{wxMenuBar::Insert}{wxmenubarinsert} to change the menubar
 dynamically.
 

diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex
index 106ff9e65d65ca56730d4de729c14a6360f8b444..1e27cc048bc60890f22d0e1751d68c68589b483d 100644 (file)
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -1602,7 +1602,9 @@ Most, but not all, windows respond to this event.
 
 \func{void}{OnSize}{\param{wxSizeEvent\& }{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}
 
 
 \wxheading{Parameters}
 

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 712e9b35bb9b6e5ba3a3bb2242cc9d5648e19493..a3dd84d625b62bfa07659922ebb6f2e8edd62ce5 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -42,9 +42,10 @@
 #include <wx/generic/fontdlgg.h>
 #endif
 
 #include <wx/generic/fontdlgg.h>
 #endif
 

+#define wxUSE_DIRDLGG 1
+

 #if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
 #if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG

-// New wxGenericDirCtrl
-#include "wx/dirctrl.h"
+#include "wx/generic/dirdlgg.h"

 #endif
 
 #include "dialogs.h"
 #endif
 
 #include "dialogs.h"

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 0f62d9a1e240a1dc9e7d886175637f98d4507865..c7a01c99c1435fbdc7e158227f35301ae49141bf 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -29,12 +29,12 @@
     #include "wx/textctrl.h"
     #include "wx/button.h"
     #include "wx/sizer.h"
     #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/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"
 
 #include "wx/generic/dirctrlg.h"
 #include "wx/generic/dirdlgg.h"
 

diff --git a/utils/tex2rtf/docs/tex2rtf.tex b/utils/tex2rtf/docs/tex2rtf.tex
index 32c15059cda584f2b88061f3348f78567133e36e..f01f682d510a6ca45632d1a41d316cacfd626b9f 100644 (file)
--- a/utils/tex2rtf/docs/tex2rtf.tex
+++ b/utils/tex2rtf/docs/tex2rtf.tex
@@ -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.}
 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}%
 \end{twocollist}
 
 \section{DDE commands}\index{DDE}%

diff --git a/utils/tex2rtf/src/htmlutil.cpp b/utils/tex2rtf/src/htmlutil.cpp
index b85e33f4a4f6f9155b65bd15e73c8982741caa82..086a32b20d07b9d8ce9b447afad4e717cea92964 100644 (file)
--- a/utils/tex2rtf/src/htmlutil.cpp
+++ b/utils/tex2rtf/src/htmlutil.cpp
@@ -181,7 +181,7 @@ void ReopenFile(FILE **fd, char **fileName)
 {
   if (*fd)
   {
 {
   if (*fd)
   {

-    fprintf(*fd, "\n</BODY></HTML>\n");
+    fprintf(*fd, "\n</FONT></BODY></HTML>\n");

     fclose(*fd);
   }
   fileId ++;
     fclose(*fd);
   }
   fileId ++;


@@ -583,6 +583,17 @@ char *ParseColourString(char *bkStr, bool *isPicture)
   else return NULL;
 }
 
   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)
 {
 // Output start of <BODY> block
 void OutputBodyStart(void)
 {


@@ -637,6 +648,8 @@ void OutputBodyStart(void)
     }
   }
   TexOutput(">\n");
     }
   }
   TexOutput(">\n");

+
+  OutputFont();

 }
 
 // Called on start/end of macro examination
 }
 
 // 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
       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)
 
         // 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);
         else
           sprintf(buf, "\n<TD ALIGN=LEFT>");
         TexOutput(buf);

+               OutputFont();

       }
       else
         TexOutput("&amp;");
       }
       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);
       else
         sprintf(buf, "<TR>\n<TD ALIGN=LEFT>");
       TexOutput(buf);

+         OutputFont();

     }
     else
     {
       // End cell and row
       // Start new row and cell
     }
     else
     {
       // End cell and row
       // Start new row and cell

-      TexOutput("</TD>\n</TR>\n");
+      TexOutput("</FONT></TD>\n</TR>\n");

     }
     break;
   }
     }
     break;
   }


@@ -2114,8 +2130,9 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
           TexOutput(buf);
         } else
           TexOutput("\n<TR><TD VALIGN=TOP>\n");
           TexOutput(buf);
         } else
           TexOutput("\n<TR><TD VALIGN=TOP>\n");

+               OutputFont();

       }  else
       }  else

-            TexOutput("\n</TD>\n");
+            TexOutput("\n</FONT></TD>\n");

     }
     if (arg_no == 2)
     {
     }
     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");
           TexOutput(buf);
         } else 
            TexOutput("\n<TD VALIGN=TOP>\n");

+               OutputFont();

       }  else
       }  else

-           TexOutput("\n</TD></TR>\n");
+           TexOutput("\n</FONT></TD></TR>\n");

     }
     return TRUE;
     break;
     }
     return TRUE;
     break;


@@ -2630,6 +2648,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         if (compatibilityMode)
         {
           TexOutput("<TR>\n<TD>");
         if (compatibilityMode)
         {
           TexOutput("<TR>\n<TD>");

+                 OutputFont();

 /*
           for (int i = 0; i < noColumns; i++)
           {
 /*
           for (int i = 0; i < noColumns; i++)
           {


@@ -2909,25 +2928,25 @@ bool HTMLGo(void)
 
     if (Chapters)
     {
 
     if (Chapters)
     {

-      fprintf(Chapters, "\n</BODY></HTML>\n");
+      fprintf(Chapters, "\n</FONT></BODY></HTML>\n");

       fclose(Chapters);
       Chapters = NULL;
     }
     if (Sections)
     {
       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)
     {
       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)
     {
       fclose(Subsections);
       Subsections = NULL;
     }
     if (Subsubsections && !combineSubSections)
     {

-      fprintf(Subsubsections, "\n</BODY></HTML>\n");
+      fprintf(Subsubsections, "\n</FONT></BODY></HTML>\n");

       fclose(Subsubsections);
       Subsubsections = NULL;
     }
       fclose(Subsubsections);
       Subsubsections = NULL;
     }


@@ -2995,7 +3014,7 @@ bool HTMLGo(void)
         fclose(fd);
       }
 
         fclose(fd);
       }
 

-      fprintf(tmpTitle, "\n</BODY>\n");
+      fprintf(tmpTitle, "\n</FONT></BODY>\n");

 
       if (htmlFrameContents)
       {
 
       if (htmlFrameContents)
       {

diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp
index ed21d3e7f88fb1cd4ee996315cf999002c3be7ef..8109c52f12b6693216cf83004aabb61588c6379d 100644 (file)
--- a/utils/tex2rtf/src/tex2any.cpp
+++ b/utils/tex2rtf/src/tex2any.cpp
@@ -145,6 +145,7 @@ char            *followedLinkColourString = NULL;
 bool            combineSubSections = FALSE;
 bool            htmlWorkshopFiles = FALSE;
 bool            ignoreBadRefs = FALSE;
 bool            combineSubSections = FALSE;
 bool            htmlWorkshopFiles = FALSE;
 bool            ignoreBadRefs = FALSE;

+char                   *htmlFaceName = copystring("Times New Roman");

 
 extern int passNumber;
 
 
 extern int passNumber;
 

diff --git a/utils/tex2rtf/src/tex2any.h b/utils/tex2rtf/src/tex2any.h
index 5b2c6f4e55309758ccede08d02e3f29c93c8cf15..2bf36720159258f6d306a023609c3dc0165dc3bb 100644 (file)
--- a/utils/tex2rtf/src/tex2any.h
+++ b/utils/tex2rtf/src/tex2any.h
@@ -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 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;
 
 // Names to help with internationalisation
 extern char *ContentsNameString;

diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp
index 15364a1670ebee9db6171197d3c82f93d6958ddd..42ed6ef86da5114d5c8af421f070d14a547dc1c7 100644 (file)
--- a/utils/tex2rtf/src/texutils.cpp
+++ b/utils/tex2rtf/src/texutils.cpp
@@ -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);
     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)
   else if (StringMatch(settingName, "winHelpTitle", FALSE, TRUE))
   {
     if (winHelpTitle)