Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrected warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2002-07-14 13:21:23 +00:00
parent 32f1f0837e
commit dda2e4fdca
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,7 +192,7 @@ int tableNo = 0;
FILE *CurrentOutput1 = NULL; FILE *CurrentOutput1 = NULL;
FILE *CurrentOutput2 = NULL; FILE *CurrentOutput2 = NULL;
FILE *Inputs[15]; FILE *Inputs[15];
int LineNumbers[15]; unsigned long LineNumbers[15];
char *FileNames[15]; char *FileNames[15];
int CurrentInputIndex = 0; int CurrentInputIndex = 0;
@@ -436,7 +436,7 @@ bool read_a_line(char *buf)
} }
int ch = -2; int ch = -2;
int bufIndex = 0; unsigned long bufIndex = 0;
buf[0] = 0; buf[0] = 0;
while (ch != EOF && ch != 10) while (ch != EOF && ch != 10)
@@ -445,7 +445,7 @@ bool read_a_line(char *buf)
{ {
wxString errBuf; wxString errBuf;
errBuf.Printf("Line %lu of file %s is too long. Lines can be no longer than %lu characters. Truncated.", errBuf.Printf("Line %lu of file %s is too long. Lines can be no longer than %lu characters. Truncated.",
LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str(),MAX_LINE_BUFFER_SIZE); LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str(), MAX_LINE_BUFFER_SIZE);
OnError((char *)errBuf.c_str()); OnError((char *)errBuf.c_str());
return FALSE; return FALSE;
} }
@@ -466,7 +466,7 @@ bool read_a_line(char *buf)
if (rightCurley > leftCurley) if (rightCurley > leftCurley)
{ {
wxString errBuf; wxString errBuf;
errBuf.Printf("An extra right Curley brace ('}') was detected at line %lu inside file %s",LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str()); errBuf.Printf("An extra right Curley brace ('}') was detected at line %lu inside file %s", LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str());
OnError((char *)errBuf.c_str()); OnError((char *)errBuf.c_str());
// Reduce the count of right Curley braces, so the mismatched count // Reduce the count of right Curley braces, so the mismatched count

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

@@ -36,9 +36,9 @@
#ifdef __WXMSW__ #ifdef __WXMSW__
const int MAX_LINE_BUFFER_SIZE = 600; const unsigned long MAX_LINE_BUFFER_SIZE = 600;
#else #else
const int MAX_LINE_BUFFER_SIZE = 11000; const unsigned long MAX_LINE_BUFFER_SIZE = 11000;
#endif #endif
class TexMacroDef: public wxObject class TexMacroDef: public wxObject

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

@@ -1580,24 +1580,24 @@ void InitialiseColourTable(void)
* The purpose of this is to reduce the number of times wxYield is * The purpose of this is to reduce the number of times wxYield is
* called, since under Windows this can slow things down. * called, since under Windows this can slow things down.
*/ */
static int yieldCount = 0;
void Tex2RTFYield(bool force) void Tex2RTFYield(bool force)
{ {
#ifdef __WXMSW__ #ifdef __WXMSW__
if (isSync) static int yieldCount = 0;
return;
if (force) if (isSync)
yieldCount = 0; return;
if (yieldCount == 0)
{ if (force)
if (wxTheApp) yieldCount = 0;
wxYield(); if (yieldCount == 0)
yieldCount = 10; {
} if (wxTheApp)
yieldCount --; wxYield();
yieldCount = 10;
}
yieldCount --;
#endif #endif
} }