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 6275ed31392daa678e7775203d950095c86fe4ce..dfb9a4e028f8b212ae9c69eb7e8e0c6aed3b0943 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.h
+++ b/utils/tex2rtf/src/tex2rtf.h
@@ -22,7 +22,7 @@
 #endif
 
 // Define a new application type
-class MyApp: public 
+class MyApp: public
                     #ifndef NO_GUI
                         wxApp
                     #else
@@ -60,7 +60,7 @@ class MyFrame: public wxFrame
     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);
@@ -74,7 +74,7 @@ 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);
 };
@@ -114,7 +114,7 @@ class ItemizeStruc: public wxObject
 };
 
 // ID for the menu quit command
-#define TEX_QUIT 1
+#define TEX_QUIT wxID_EXIT
 #define TEX_GO   2
 
 #define TEX_SET_INPUT   3
@@ -131,11 +131,11 @@ class ItemizeStruc: public wxObject
 #define TEX_MODE_HTML   11
 #define TEX_MODE_XLP    12
 
-#define TEX_OPTIONS_CURLEY_BRACE 13
+#define TEX_OPTIONS_CURLY_BRACE 13
 #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;
@@ -150,8 +150,8 @@ extern FILE *Sections;
 extern FILE *Subsections;
 extern FILE *Subsubsections;
 
-extern wxChar *InputFile;
-extern wxChar *OutputFile;
+extern wxString InputFile;
+extern wxString OutputFile;
 extern wxChar *MacroFile;
 
 extern wxChar *FileRoot;