X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3883022093c42e3fb7b248ea2cb4bbd1e056a75b..08a092f9f4de6c80a2d43d4072c379ac84e6cc2f:/samples/typetest/typetest.h

diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h
index ae37f643fb..90c4e153bb 100644
--- a/samples/typetest/typetest.h
+++ b/samples/typetest/typetest.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -20,24 +20,33 @@
 class MyApp: public wxApp
 {
 public:
-    bool OnInit(void);
+    MyApp() { m_textCtrl = NULL; m_mimeDatabase = NULL; }
+
+    bool OnInit();
+    int OnExit() { delete m_mimeDatabase; return wxApp::OnExit(); }
 
     void DoDateDemo(wxCommandEvent& event);
     void DoTimeDemo(wxCommandEvent& event);
     void DoVariantDemo(wxCommandEvent& event);
     void DoByteOrderDemo(wxCommandEvent& event);
     void DoStreamDemo(wxCommandEvent& event);
+    void DoStreamDemo2(wxCommandEvent& event);
+    void DoStreamDemo3(wxCommandEvent& event);
+    void DoStreamDemo4(wxCommandEvent& event);
+    void DoStreamDemo5(wxCommandEvent& event);
 #if wxUSE_UNICODE
     void DoUnicodeDemo(wxCommandEvent& event);
 #endif
+    void DoMIMEDemo(wxCommandEvent& event);
 
-    wxTextCtrl*     GetTextCtrl() const { return m_textCtrl; }
+    wxTextCtrl* GetTextCtrl() const { return m_textCtrl; }
 
 private:
-    wxTextCtrl*     m_textCtrl;
+    wxTextCtrl* m_textCtrl;
+    wxMimeTypesManager *m_mimeDatabase;
 
-DECLARE_DYNAMIC_CLASS(MyApp)
-DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(MyApp)
+    DECLARE_EVENT_TABLE()
 };
 
 DECLARE_APP(MyApp)
@@ -48,26 +57,33 @@ class MyFrame: public wxFrame
 public:
     MyFrame(wxFrame *parent, const wxString& title,
             const wxPoint& pos, const wxSize& size);
-    
+
 public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
-   DECLARE_EVENT_TABLE()
-    
+    DECLARE_EVENT_TABLE()
 };
 
 // ID for the menu commands
-#define TYPES_QUIT 	    wxID_EXIT
-#define TYPES_TEXT 	    101
-#define TYPES_ABOUT     102
-
-#define TYPES_DATE      103
-#define TYPES_TIME      104
-#define TYPES_VARIANT   105
-#define TYPES_BYTEORDER 106
-#define TYPES_UNICODE   107
-#define TYPES_STREAM    108
+enum
+{
+    TYPES_QUIT = wxID_EXIT,
+    TYPES_TEXT = 101,
+    TYPES_ABOUT,
+
+    TYPES_DATE,
+    TYPES_TIME,
+    TYPES_VARIANT,
+    TYPES_BYTEORDER,
+    TYPES_UNICODE,
+    TYPES_STREAM,
+    TYPES_STREAM2,
+    TYPES_STREAM3,
+    TYPES_STREAM4,
+    TYPES_STREAM5,
+    TYPES_MIME
+};
 
 #endif
     // _WX_TYPETEST_H_