FILE *tempfd = wxFopen(_T("tmp.tmp"), _T("w"));
if (!tempfd)
return;
-
+
FILE *old1 = CurrentOutput1;
FILE *old2 = CurrentOutput2;
-
+
CurrentOutput1 = tempfd;
CurrentOutput2 = NULL;
-
+
TraverseChildrenFromChunk(chunk);
-
+
CurrentOutput1 = old1;
CurrentOutput2 = old2;
-
+
fclose(tempfd);
-
+
// Read from file into string
tempfd = wxFopen(_T("tmp.tmp"), _T("r"));
if (!tempfd)
buf[i] = 0;
else
{
- buf[i] = ch;
+ buf[i] = (wxChar)ch;
i ++;
}
}
{
if (forceTopicName)
return forceTopicName;
-
+
wxChar *topicName = NULL;
static wxChar topicBuf[100];
* Snag is that some save a TexChunk, so don't use yet...
*
*/
-
+
void StartSimulateArgument(wxChar *data)
{
wxStrcpy(currentArgData, data);
if (unitArg[i] == '\\')
unitArg[i] = 0;
len = wxStrlen(unitArg);
-
+
if (unitArg && (len > 0) && (isdigit(unitArg[0]) || unitArg[0] == '-'))
{
wxSscanf(unitArg, _T("%f"), &unitValue);
if (len > 1)
{
- wxChar units[3];
+ wxChar units[3];
units[0] = unitArg[len-2];
units[1] = unitArg[len-1];
units[2] = 0;
* IF one exists. Inserts zero into buffer.
*
*/
-
+
void StripExtension(wxChar *buffer)
{
int len = wxStrlen(buffer);
}
}
-
+
/*
* Latex references
*
*/
-
+
void AddTexRef(wxChar *name, wxChar *file, wxChar *sectionName,
int chapter, int section, int subsection, int subsubsection)
{
TexRef *texRef = (TexRef *)TexReferences.Get(name);
if (texRef) TexReferences.Delete(name);
-
+
wxChar buf[100];
buf[0] = 0;
/*
wxString name = filename;
wxSTD ofstream ostr((char const *)name.fn_str());
if (ostr.bad()) return;
-
+
TexReferences.BeginFind();
- wxNode *node = TexReferences.Next();
+ wxHashTable::Node *node = TexReferences.Next();
while (node)
{
Tex2RTFYield();
if (!istr.eof())
{
istr >> file;
- istr >> sectionName;
+ istr >> sectionName;
char ch;
istr.get(ch); // Read past space
istr.get(ch);
wxString sectionName_string = wxString::FromAscii(sectionName);
wxString section_string = wxString::FromAscii(section);
- // gt - needed to trick the hash table "TexReferences" into deleting the key
+ // gt - needed to trick the hash table "TexReferences" into deleting the key
// strings it creates in the Put() function, but not the item that is
// created here, as that is destroyed elsewhere. Without doing this, there
// were massive memory leaks
TexReferences.DeleteContents(true);
TexReferences.Put(
- label_string.c_str(),
+ label_string.c_str(),
new TexRef(
- label_string.c_str(),
- file_string.c_str(),
- section_string.c_str(),
+ label_string.c_str(),
+ file_string.c_str(),
+ section_string.c_str(),
sectionName_string.c_str()
)
);
void BibEatWhiteSpace(wxSTD istream& str)
{
- char ch = str.peek();
-
- while (!str.eof() && (ch == ' ' || ch == '\t' || ch == 13 || ch == 10 || ch == EOF))
+ char ch = (char)str.peek();
+
+ while (!str.eof() && (ch == ' ' || ch == '\t' || ch == 13 || ch == 10 || ch == (char)EOF))
{
if (ch == 10)
BibLine ++;
str.get(ch);
- if ((ch == EOF) || str.eof()) return;
- ch = str.peek();
+ if ((ch == (char)EOF) || str.eof()) return;
+ ch = (char)str.peek();
}
// Ignore end-of-line comments
if (ch == '%' || ch == ';' || ch == '#')
{
str.get(ch);
- ch = str.peek();
+ ch = (char)str.peek();
while (ch != 10 && ch != 13 && !str.eof())
{
str.get(ch);
- ch = str.peek();
+ ch = (char)str.peek();
}
BibEatWhiteSpace(str);
}
{
int i = 0;
buffer[i] = 0;
- char ch = istr.peek();
+ char ch = (char)istr.peek();
while (!istr.eof() && ch != ' ' && ch != '{' && ch != '(' && ch != 13 && ch != 10 && ch != '\t' &&
ch != ',' && ch != '=')
{
istr.get(ch);
buffer[i] = ch;
i ++;
- ch = istr.peek();
+ ch = (char)istr.peek();
}
buffer[i] = 0;
}
{
int i = 0;
buffer[i] = 0;
- char ch = istr.peek();
+ char ch = (char)istr.peek();
bool inQuotes = false;
if (ch == '"')
{
istr.get(ch);
- ch = istr.peek();
+ ch = (char)istr.peek();
inQuotes = true;
}
// If in quotes, read white space too. If not,
istr.get(ch);
buffer[i] = ch;
i ++;
- ch = istr.peek();
+ ch = (char)istr.peek();
}
if (ch == '"')
istr.get(ch);
int braceCount = 1;
int i = 0;
buffer[i] = 0;
- char ch = istr.peek();
+ char ch = (char)istr.peek();
bool stopping = false;
while (!istr.eof() && !stopping)
{
return;
}
istr.get(ch);
-
+
if (ch == '{')
braceCount ++;
buffer[i] = 0;
wxUnusedVar(stopping);
}
-
+
bool ReadBib(wxChar *filename)
{
if (!wxFileExists(filename))
istr.get(ch);
if (istr.eof())
break;
-
+
if (ch != '\\') // Not a macro definition, so must be NAME=VALUE
{
wxChar settingName[100];
BibReadValue(istr, macroBody, false, false); // Don't ignore extra braces
if (wxStrlen(macroBody) > 0)
macro->macroBody = copystring(macroBody);
-
+
BibEatWhiteSpace(istr);
CustomMacroList.Append(macroName, macro);
AddMacroDef(ltCUSTOM_MACRO, macroName, noArgs);
OnInform(mbuf);
return true;
}
-
+
CustomMacro *FindCustomMacro(wxChar *name)
{
wxNode *node = CustomMacroList.Find(name);
OnInform(_T("No custom macros loaded.\n"));
return;
}
-
+
wxChar buf[400];
while (node)
{
buffer[i] = 0;
if (oldPos == (*pos))
*pos = len + 1;
-
+
if (i == 0)
return NULL;
else
* Colour tables
*
*/
-
+
ColourTableEntry::ColourTableEntry(const wxChar *theName, unsigned int r, unsigned int g, unsigned int b)
{
name = copystring(theName);
if (wxStrcmp(theName, entry->name) == 0)
{
wxStrcpy(buf, _T("#"));
-
+
wxChar buf2[3];
DecToHex(entry->red, buf2);
wxStrcat(buf, buf2);
return false;
}
-
+
void InitialiseColourTable(void)
{
// \\red0\\green0\\blue0;
// \\red0\\green255\\blue0;
AddColour(_T("green"), 0,255,0);
-
+
// \\red255\\green0\\blue255;
AddColour(_T("magenta"), 255,0,255);
// \\red255\\green0\\blue0;
AddColour(_T("red"), 255,0,0);
-
+
// \\red255\\green255\\blue0;
AddColour(_T("yellow"), 255,255,0);
-
+
// \\red255\\green255\\blue255;}");
AddColour(_T("white"), 255,255,255);
}
{
#ifdef __WXMSW__
static int yieldCount = 0;
-
+
if (isSync)
- return;
-
+ return;
+
if (force)
- yieldCount = 0;
+ yieldCount = 0;
if (yieldCount == 0)
{
- if (wxTheApp)
- wxYield();
- yieldCount = 10;
+ if (wxTheApp)
+ wxYield();
+ yieldCount = 10;
}
yieldCount --;
#endif
texTopic->keywords = new wxStringList;
TopicTable.Put(topic, texTopic);
}
-
+
if (!texTopic->keywords->Member(entry))
texTopic->keywords->Add(entry);
}
void ClearKeyWordTable(void)
{
TopicTable.BeginFind();
- wxNode *node = TopicTable.Next();
+ wxHashTable::Node *node = TopicTable.Next();
while (node)
{
TexTopic *texTopic = (TexTopic *)node->GetData();
/*
* TexTopic structure
*/
-
+
TexTopic::TexTopic(wxChar *f)
{
if (f)
int i;
if (upperCaseNames)
for (i = 0; i < len; i ++)
- buf[i] = wxToupper(s[i]);
+ buf[i] = (wxChar)wxToupper(s[i]);
else
for (i = 0; i < len; i ++)
- buf[i] = wxTolower(s[i]);
+ buf[i] = (wxChar)wxTolower(s[i]);
buf[i] = 0;
- return buf;
+ return buf;
}
#if !WXWIN_COMPATIBILITY_2
-// if substring is TRUE, search for str1 in str2
-bool StringMatch(const wxChar *str1, const wxChar *str2, bool subString,
+// if substring is true, search for str1 in str2
+bool StringMatch(const wxChar *str1, const wxChar *str2, bool subString,
bool exact)
{
if (subString)
return Sstr2.Index(Sstr1) != (size_t)wxNOT_FOUND;
}
else
- return exact ? wxString(str2).Cmp(str1) == 0 :
+ return exact ? wxString(str2).Cmp(str1) == 0 :
wxString(str2).CmpNoCase(str1) == 0;
}
#endif
projects / wxWidgets.git / blobdiff