check parameters after options check sothat usign -version doesn't result in an error

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

diff --git a/utils/tex2rtf/src/tex2rtf.h b/utils/tex2rtf/src/tex2rtf.h
index 70f2156b6dcee0f9ab83e56ccd5bad10f6da2c3b..1ed4e198e2f658bfed248b15518b06d13522c0f1 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.h
+++ b/utils/tex2rtf/src/tex2rtf.h
@@ -2,27 +2,48 @@
 // Name:        tex2any.h
 // Purpose:     tex2RTF conversion header
 // Author:      Julian Smart
 // Name:        tex2any.h
 // Purpose:     tex2RTF conversion header
 // Author:      Julian Smart

-// Modified by:
+// Modified by: Wlodzimiez ABX Skiba 2003/2004 Unicode support

 // Created:     7.9.93
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Created:     7.9.93
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#include "wx/app.h"
+

 #ifndef NO_GUI
 #ifndef NO_GUI

+    #include "wx/frame.h"
+    #include "wx/textctrl.h"
+
+#ifdef __WXMSW__
+    #include "wx/dde.h"
+#endif
+
+#endif
+

 // Define a new application type
 // Define a new application type

-class MyApp: public wxApp
+class MyApp: public
+                    #ifndef NO_GUI
+                        wxApp
+                    #else
+                        wxAppConsole
+                    #endif

 { public:
     bool OnInit();
 { public:
     bool OnInit();

+#ifdef NO_GUI
+    int OnRun() { return EXIT_SUCCESS; }
+#else

     int OnExit();
     int OnExit();

+#endif

 };
 
 };
 

+#ifndef NO_GUI
+

 // Define a new frame type
 class MyFrame: public wxFrame
 { public:
     wxTextCtrl *textWindow;
     MyFrame(wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size);
 // Define a new frame type
 class MyFrame: public wxFrame
 { public:
     wxTextCtrl *textWindow;
     MyFrame(wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size);

-    void OnMenuCommand(int id);

 
     void OnCloseWindow(wxCloseEvent& event);
     void OnExit(wxCommandEvent& event);
 
     void OnCloseWindow(wxCloseEvent& event);
     void OnExit(wxCommandEvent& event);


@@ -38,6 +59,8 @@ class MyFrame: public wxFrame
     void OnModeWinHelp(wxCommandEvent& event);
     void OnModeHTML(wxCommandEvent& event);
     void OnModeXLP(wxCommandEvent& event);
     void OnModeWinHelp(wxCommandEvent& event);
     void OnModeHTML(wxCommandEvent& event);
     void OnModeXLP(wxCommandEvent& event);

+    void OnOptionsCurlyBrace(wxCommandEvent& event);
+    void OnOptionsSyntaxChecking(wxCommandEvent& event);

     void OnHelp(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnHelp(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 


@@ -45,15 +68,14 @@ DECLARE_EVENT_TABLE()
 };
 
 #ifdef __WXMSW__
 };
 
 #ifdef __WXMSW__

-#include "wx/dde.h"

 
 class Tex2RTFConnection: public wxDDEConnection
 {
  public:
 
 class Tex2RTFConnection: public wxDDEConnection
 {
  public:

-  Tex2RTFConnection(char *buf, int size);
-  ~Tex2RTFConnection(void);
-  bool OnExecute(const wxString& topic, char *data, int size, int format);
-  char *OnRequest(const wxString& topic, const wxString& item, int *size, int format);
+  Tex2RTFConnection(wxChar *buf, int size);
+  virtual ~Tex2RTFConnection(void){}
+  bool OnExecute(const wxString& topic, wxChar *data, int size, wxIPCFormat format);
+  wxChar *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format);

 };
 
 class Tex2RTFServer: public wxDDEServer
 };
 
 class Tex2RTFServer: public wxDDEServer


@@ -91,7 +113,7 @@ class ItemizeStruc: public wxObject
 };
 
 // ID for the menu quit command
 };
 
 // ID for the menu quit command

-#define TEX_QUIT 1
+#define TEX_QUIT wxID_EXIT

 #define TEX_GO   2
 
 #define TEX_SET_INPUT   3
 #define TEX_GO   2
 
 #define TEX_SET_INPUT   3


@@ -108,13 +130,16 @@ class ItemizeStruc: public wxObject
 #define TEX_MODE_HTML   11
 #define TEX_MODE_XLP    12
 
 #define TEX_MODE_HTML   11
 #define TEX_MODE_XLP    12
 

-#define TEX_HELP        13
-#define TEX_ABOUT       14
-#define TEX_SAVE_FILE   15
+#define TEX_OPTIONS_CURLY_BRACE 13
+#define TEX_OPTIONS_SYNTAX_CHECKING 14
+
+#define TEX_HELP        15
+#define TEX_ABOUT       wxID_ABOUT
+#define TEX_SAVE_FILE   17

 
 extern TexChunk *currentMember;
 extern bool startedSections;
 
 extern TexChunk *currentMember;
 extern bool startedSections;

-extern char *contentsString;
+extern wxChar *contentsString;

 extern bool suppressNameDecoration;
 extern wxList itemizeStack;
 
 extern bool suppressNameDecoration;
 extern wxList itemizeStack;
 


@@ -124,21 +149,21 @@ extern FILE *Sections;
 extern FILE *Subsections;
 extern FILE *Subsubsections;
 
 extern FILE *Subsections;
 extern FILE *Subsubsections;
 

-extern char *InputFile;
-extern char *OutputFile;
-extern char *MacroFile;
+extern wxString InputFile;
+extern wxString OutputFile;
+extern wxChar *MacroFile;

 
 

-extern char *FileRoot;
-extern char *ContentsName;    // Contents page from last time around
-extern char *TmpContentsName; // Current contents page
-extern char *TmpFrameContentsName; // Current frame contents page
-extern char *WinHelpContentsFileName; // WinHelp .cnt file
-extern char *RefName;         // Reference file name
-extern char *bulletFile;
+extern wxChar *FileRoot;
+extern wxChar *ContentsName;    // Contents page from last time around
+extern wxChar *TmpContentsName; // Current contents page
+extern wxChar *TmpFrameContentsName; // Current frame contents page
+extern wxChar *WinHelpContentsFileName; // WinHelp .cnt file
+extern wxChar *RefName;         // Reference file name
+extern wxChar *bulletFile;

 
 #ifndef NO_GUI
 
 #ifndef NO_GUI

-void ChooseOutputFile(bool force = FALSE);
-void ChooseInputFile(bool force = FALSE);
+void ChooseOutputFile(bool force = false);
+void ChooseInputFile(bool force = false);

 #endif
 
 void RTFOnMacro(int macroId, int no_args, bool start);
 #endif
 
 void RTFOnMacro(int macroId, int no_args, bool start);