corrected a type in the constructor from two points

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

diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index e115c0d4dc4ace1205f42eee81f8bd46c47d4ce6..5e35432637fe4a81b535bb90d18dfe20618b96d4 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.cpp
+++ b/utils/tex2rtf/src/tex2rtf.cpp
@@ -101,6 +101,9 @@ bool Go(void);
 void ShowOptions(void);
 
 #ifdef NO_GUI
+
+extern char *wxBuffer; // we must init it, otherwise tex2rtf will crash
+
 int main(int argc, char **argv)
 #else
 wxMenuBar *menuBar = NULL;
@@ -146,12 +149,16 @@ bool MyApp::OnInit()
   }
 
 #ifdef NO_GUI
+  wxBuffer = new char[1500];
+  // this is done in wxApp, but NO_GUI version doesn't call it :-(
+
   if (!InputFile || !OutputFile)
   {
     cout << "Tex2RTF: input or output file is missing.\n";
     ShowOptions();
     exit(1);
   }
+
 #endif
   if (InputFile)
   {
@@ -374,10 +381,12 @@ bool MyApp::OnInit()
   // Return the main frame window
   return TRUE;
 #else
+  delete[] wxBuffer;
   return FALSE;
 #endif
 }
 
+#ifndef NO_GUI
 int MyApp::OnExit()
 {
   wxNode *node = CustomMacroList.First();
@@ -411,7 +420,7 @@ int MyApp::OnExit()
 
   return 0;
 }
-
+#endif
 void ShowOptions(void)
 {
     char buf[100];
@@ -647,7 +656,7 @@ void ChooseOutputFile(bool force)
   char extensionBuf[10];
   char wildBuf[10];
   strcpy(wildBuf, "*.");
-  char *path = NULL;
+  wxString path;
   if (OutputFile)
     path = wxPathOnly(OutputFile);
   else if (InputFile)
@@ -1073,3 +1082,15 @@ char *Tex2RTFConnection::OnRequest(const wxString& topic, const wxString& item,
 
 #endif
 
+
+#ifndef NO_GUI
+#ifndef __WXGTK__
+void wxObject::Dump(ostream& str)
+{
+  if (GetClassInfo() && GetClassInfo()->GetClassName())
+    str << GetClassInfo()->GetClassName();
+  else
+    str << "unknown object class";
+}
+#endif
+#endif
\ No newline at end of file