remove miniframe stuff from GtkOnSize(), it's handled by wxFrame

[wxWidgets.git] / utils / tex2rtf / src / table.cpp

diff --git a/utils/tex2rtf/src/table.cpp b/utils/tex2rtf/src/table.cpp
index 4dc88ee028e41d4f9c6ff15afbf590297ae21e7b..55a8e68279798f6f035b71d0ab81e8b9c4c71bb0 100644 (file)
--- 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
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -21,11 +18,13 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"

 #endif
 
 #endif
 

+#include "wx/hash.h"

 
 

-#include <wx/hash.h>
+#ifdef new
+#undef new
+#endif

 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>


@@ -40,11 +39,11 @@
 #include "table.h"
 
 ColumnData TableData[40];
 #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;
 int noColumns = 0;   // Current number of columns in table
 int ruleTop = 0;
 int ruleBottom = 0;


@@ -55,71 +54,71 @@ int currentRowNumber = 0;
  *
  */
 
  *
  */
 

-bool ParseTableArgument(char *value)
+bool ParseTableArgument(wxChar *value)

 {
   noColumns = 0;
   int i = 0;
 {
   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 ++;
   while (i < len)
   {
     int ch = value[i];
     if (ch == '|')
     {
       i ++;

-      isBorder = TRUE;
+      isBorder = true;

     }
     else if (ch == 'l')
     {
       TableData[noColumns].leftBorder = isBorder;
     }
     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].justification = 'l';
       TableData[noColumns].width = 2000; // Estimate

-      TableData[noColumns].absWidth = FALSE;
+      TableData[noColumns].absWidth = false;

 //      TableData[noColumns].spacing = ??
       noColumns ++;
       i ++;
 //      TableData[noColumns].spacing = ??
       noColumns ++;
       i ++;

-      isBorder = FALSE;
+      isBorder = false;

     }
     else if (ch == 'c')
     {
       TableData[noColumns].leftBorder = isBorder;
     }
     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].justification = 'c';
       TableData[noColumns].width = defaultTableColumnWidth; // Estimate

-      TableData[noColumns].absWidth = FALSE;
+      TableData[noColumns].absWidth = false;

 //      TableData[noColumns].spacing = ??
       noColumns ++;
       i ++;
 //      TableData[noColumns].spacing = ??
       noColumns ++;
       i ++;

-      isBorder = FALSE;
+      isBorder = false;

     }
     else if (ch == 'r')
     {
       TableData[noColumns].leftBorder = isBorder;
     }
     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].justification = 'r';
       TableData[noColumns].width = 2000; // Estimate

-      TableData[noColumns].absWidth = FALSE;
+      TableData[noColumns].absWidth = false;

 //      TableData[noColumns].spacing = ??
       noColumns ++;
       i ++;
 //      TableData[noColumns].spacing = ??
       noColumns ++;
       i ++;

-      isBorder = FALSE;
+      isBorder = false;

     }
     else if (ch == 'p')
     {
       i ++;
       int j = 0;
     }
     else if (ch == 'p')
     {
       i ++;
       int j = 0;

-      char numberBuf[50];
+      wxChar numberBuf[50];

       ch = value[i];
       if (ch == '{')
       {
         i++;
         ch = value[i];
       }
       ch = value[i];
       if (ch == '{')
       {
         i++;
         ch = value[i];
       }

-        
+

       while ((i < len) && (isdigit(ch) || ch == '.'))
       {
       while ((i < len) && (isdigit(ch) || ch == '.'))
       {

-        numberBuf[j] = ch;
+        numberBuf[j] = (wxChar)ch;

         j ++;
         i ++;
         ch = value[i];
         j ++;
         i ++;
         ch = value[i];


@@ -131,26 +130,26 @@ bool ParseTableArgument(char *value)
       j ++; i++;
       numberBuf[j] = 0;
       if (value[i] == '}') i++;
       j ++; i++;
       numberBuf[j] = 0;
       if (value[i] == '}') i++;

-      
+

       TableData[noColumns].leftBorder = isBorder;
       TableData[noColumns].leftBorder = isBorder;

-      TableData[noColumns].rightBorder = FALSE;
+      TableData[noColumns].rightBorder = false;

       TableData[noColumns].justification = 'l';
       TableData[noColumns].width = 20*ParseUnitArgument(numberBuf);
       TableData[noColumns].justification = 'l';
       TableData[noColumns].width = 20*ParseUnitArgument(numberBuf);

-      TableData[noColumns].absWidth = TRUE;
+      TableData[noColumns].absWidth = true;

 //      TableData[noColumns].spacing = ??
       noColumns ++;
 //      TableData[noColumns].spacing = ??
       noColumns ++;

-      isBorder = FALSE;
+      isBorder = false;

     }
     else
     {
     }
     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;
       OnError(buf);
       delete[] buf;

-      return FALSE;
+      return false;

     }
   }
   if (isBorder)
     }
   }
   if (isBorder)

-    TableData[noColumns-1].rightBorder = TRUE;
-  return TRUE;
+    TableData[noColumns-1].rightBorder = true;
+  return true;

 }
 }