Patch [ 1314868 ] [wxMSW] Show MDI child menubars when ShowFullScreen(false)

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

diff --git a/utils/tex2rtf/src/tex2rtf.h b/utils/tex2rtf/src/tex2rtf.h
index 84f361cc029b40e90b1485ce98797b9a316dcdcd..dfb9a4e028f8b212ae9c69eb7e8e0c6aed3b0943 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.h
+++ b/utils/tex2rtf/src/tex2rtf.h
@@ -2,26 +2,43 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef NO_GUI

 #include "wx/app.h"
 #include "wx/app.h"

-#include "wx/frame.h"

 
 

-class WXDLLEXPORT wxTextCtrl;
+#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:
 // Define a new frame type
 class MyFrame: public wxFrame
 { public:


@@ -43,7 +60,7 @@ 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 OnOptionsCurleyBrace(wxCommandEvent& event);
+    void OnOptionsCurlyBrace(wxCommandEvent& event);

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


@@ -52,13 +69,12 @@ DECLARE_EVENT_TABLE()
 };
 
 #ifdef __WXMSW__
 };
 
 #ifdef __WXMSW__

-#include "wx/dde.h"

 
 class Tex2RTFConnection: public wxDDEConnection
 {
  public:
   Tex2RTFConnection(wxChar *buf, int size);
 
 class Tex2RTFConnection: public wxDDEConnection
 {
  public:
   Tex2RTFConnection(wxChar *buf, int size);

-  ~Tex2RTFConnection(void);
+  ~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);
 };
   bool OnExecute(const wxString& topic, wxChar *data, int size, wxIPCFormat format);
   wxChar *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format);
 };


@@ -98,7 +114,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


@@ -115,11 +131,11 @@ 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_OPTIONS_CURELY_BRACE 13
+#define TEX_OPTIONS_CURLY_BRACE 13

 #define TEX_OPTIONS_SYNTAX_CHECKING 14
 
 #define TEX_HELP        15
 #define TEX_OPTIONS_SYNTAX_CHECKING 14
 
 #define TEX_HELP        15

-#define TEX_ABOUT       16
+#define TEX_ABOUT       wxID_ABOUT

 #define TEX_SAVE_FILE   17
 
 extern TexChunk *currentMember;
 #define TEX_SAVE_FILE   17
 
 extern TexChunk *currentMember;


@@ -134,8 +150,8 @@ extern FILE *Sections;
 extern FILE *Subsections;
 extern FILE *Subsubsections;
 
 extern FILE *Subsections;
 extern FILE *Subsubsections;
 

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

 extern wxChar *MacroFile;
 
 extern wxChar *FileRoot;
 extern wxChar *MacroFile;
 
 extern wxChar *FileRoot;


@@ -147,8 +163,8 @@ extern wxChar *RefName;         // Reference file name
 extern wxChar *bulletFile;
 
 #ifndef NO_GUI
 extern wxChar *bulletFile;
 
 #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);