X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5aa5c1e4c9150c6cacdaf6090e2ae8c496e79b6b..3be926e348e2d0a3a2c278b9f2cff7843971e0c9:/utils/tex2rtf/src/table.cpp diff --git a/utils/tex2rtf/src/table.cpp b/utils/tex2rtf/src/table.cpp index fa41681140..55a8e68279 100644 --- a/utils/tex2rtf/src/table.cpp +++ b/utils/tex2rtf/src/table.cpp @@ -2,17 +2,14 @@ // 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 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -21,7 +18,6 @@ #endif #ifndef WX_PRECOMP -#include "wx/wx.h" #endif #include "wx/hash.h" @@ -43,11 +39,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; @@ -58,71 +54,71 @@ int currentRowNumber = 0; * */ -bool ParseTableArgument(char *value) +bool ParseTableArgument(wxChar *value) { noColumns = 0; int i = 0; - int len = strlen(value); - bool isBorder = FALSE; + int len = wxStrlen(value); + 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') { i ++; int j = 0; - char numberBuf[50]; + wxChar numberBuf[50]; ch = value[i]; if (ch == '{') { i++; ch = value[i]; } - + while ((i < len) && (isdigit(ch) || ch == '.')) { - numberBuf[j] = ch; + numberBuf[j] = (wxChar)ch; j ++; i ++; ch = value[i]; @@ -134,26 +130,26 @@ bool ParseTableArgument(char *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 { - char *buf = new char[strlen(value) + 80]; - sprintf(buf, "Tabular first argument \"%s\" too complex!", value); + wxChar *buf = new wxChar[wxStrlen(value) + 80]; + 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; }