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

More updates to the Debian packaging for wxPython, unicode and

Browse Source 
the project name change.

Applied patch from ABX to make tex2rtf unicode compatible, then
removed wxSprintf lameness from it so it might actually work.
Also modified it to return true from tex2rtf OnInit in console
builds so the app will exit with a successful return code rather
than always returning failure even when it succeeds.

Implemented unicode capable wxCtime for glibc systems also needed
by tex2rtf.

Wrapped dde include in tex2rtf in a guard and assert that dde is
MSW only in its forwarding header.

Lowered the limit of maxlen in wxSprintf so it actually has a
chance to segfault on people instead of failing silently and
mysteriously with glibc.

Silenced some other 'potentially uninitialised variable' warnings
from gcc3, most of which were bogus, one potentially not so.

Added missing newline at the end of fontdlg.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2004-03-05 17:40:38 +00:00
parent a0af0d98b5
commit b63b07a809
46 changed files with 1351 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
utils/tex2rtf/src/table.cpp
View File

@@ -2,7 +2,8 @@
// Name: table.cpp
// Purpose: Utilities for manipulating tables
// Author: Julian Smart
// Modified by:
// Modified by: Wlodzimiez ABX Skiba 2003/2004 Unicode support
// Ron Lee
// Created: 01/01/99
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
@@ -42,11 +43,11 @@
#include "table.h"
ColumnData TableData[40];
bool inTabular = FALSE;
bool inTabular = false;
bool startRows = FALSE;
bool tableVerticalLineLeft = FALSE;
bool tableVerticalLineRight = FALSE;
bool startRows = false;
bool tableVerticalLineLeft = false;
bool tableVerticalLineRight = false;
int noColumns = 0; // Current number of columns in table
int ruleTop = 0;
int ruleBottom = 0;
@@ -62,50 +63,50 @@ bool ParseTableArgument(wxChar *value)
noColumns = 0;
int i = 0;
int len = wxStrlen(value);
bool isBorder = FALSE;
bool isBorder = false;
while (i < len)
{
int ch = value[i];
if (ch == '|')
{
i ++;
isBorder = TRUE;
isBorder = true;
}
else if (ch == 'l')
{
TableData[noColumns].leftBorder = isBorder;
TableData[noColumns].rightBorder = FALSE;
TableData[noColumns].rightBorder = false;
TableData[noColumns].justification = 'l';
TableData[noColumns].width = 2000; // Estimate
TableData[noColumns].absWidth = FALSE;
TableData[noColumns].absWidth = false;
// TableData[noColumns].spacing = ??
noColumns ++;
i ++;
isBorder = FALSE;
isBorder = false;
}
else if (ch == 'c')
{
TableData[noColumns].leftBorder = isBorder;
TableData[noColumns].rightBorder = FALSE;
TableData[noColumns].rightBorder = false;
TableData[noColumns].justification = 'c';
TableData[noColumns].width = defaultTableColumnWidth; // Estimate
TableData[noColumns].absWidth = FALSE;
TableData[noColumns].absWidth = false;
// TableData[noColumns].spacing = ??
noColumns ++;
i ++;
isBorder = FALSE;
isBorder = false;
}
else if (ch == 'r')
{
TableData[noColumns].leftBorder = isBorder;
TableData[noColumns].rightBorder = FALSE;
TableData[noColumns].rightBorder = false;
TableData[noColumns].justification = 'r';
TableData[noColumns].width = 2000; // Estimate
TableData[noColumns].absWidth = FALSE;
TableData[noColumns].absWidth = false;
// TableData[noColumns].spacing = ??
noColumns ++;
i ++;
isBorder = FALSE;
isBorder = false;
}
else if (ch == 'p')
{
@@ -118,7 +119,7 @@ bool ParseTableArgument(wxChar *value)
i++;
ch = value[i];
}
while ((i < len) && (isdigit(ch) || ch == '.'))
{
numberBuf[j] = ch;
@@ -133,26 +134,26 @@ bool ParseTableArgument(wxChar *value)
j ++; i++;
numberBuf[j] = 0;
if (value[i] == '}') i++;
TableData[noColumns].leftBorder = isBorder;
TableData[noColumns].rightBorder = FALSE;
TableData[noColumns].rightBorder = false;
TableData[noColumns].justification = 'l';
TableData[noColumns].width = 20*ParseUnitArgument(numberBuf);
TableData[noColumns].absWidth = TRUE;
TableData[noColumns].absWidth = true;
// TableData[noColumns].spacing = ??
noColumns ++;
isBorder = FALSE;
isBorder = false;
}
else
{
wxChar *buf = new wxChar[wxStrlen(value) + 80];
wxSprintf(buf, _T("Tabular first argument \"%s\" too complex!"), value);
wxSnprintf(buf, wxStrlen(value) + 80, _T("Tabular first argument \"%s\" too complex!"), value);
OnError(buf);
delete[] buf;
return FALSE;
return false;
}
}
if (isBorder)
TableData[noColumns-1].rightBorder = TRUE;
return TRUE;
TableData[noColumns-1].rightBorder = true;
return true;
}