made sure the alignment for the non-carbon fake list def resource is always 68k

[wxWidgets.git] / samples / typetest / typetest.h

diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h
index ae37f643fb2d863d9e1333980c999ad29a705802..2fa8ab0e0cc2834bebb4bca6bd93bd3b0afd2583 100644 (file)
--- 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
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -20,24 +20,35 @@
 class MyApp: public wxApp
 {
 public:
 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(); }
+
+#if wxUSE_TIMEDATE

     void DoDateDemo(wxCommandEvent& event);
     void DoDateDemo(wxCommandEvent& event);

+#endif // wxUSE_TIMEDATE

     void DoTimeDemo(wxCommandEvent& event);
     void DoVariantDemo(wxCommandEvent& event);
     void DoByteOrderDemo(wxCommandEvent& event);
     void DoStreamDemo(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);
 #if wxUSE_UNICODE
     void DoUnicodeDemo(wxCommandEvent& event);

-#endif
+#endif // wxUSE_UNICODE
+    void DoMIMEDemo(wxCommandEvent& event);

 
 

-    wxTextCtrl*     GetTextCtrl() const { return m_textCtrl; }
+    wxTextCtrl* GetTextCtrl() const { return m_textCtrl; }

 
 private:
 
 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)
 };
 
 DECLARE_APP(MyApp)


@@ -48,26 +59,33 @@ class MyFrame: public wxFrame
 public:
     MyFrame(wxFrame *parent, const wxString& title,
             const wxPoint& pos, const wxSize& size);
 public:
     MyFrame(wxFrame *parent, const wxString& title,
             const wxPoint& pos, const wxSize& size);

-    
+

 public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
 public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 

-   DECLARE_EVENT_TABLE()
-    
+    DECLARE_EVENT_TABLE()

 };
 
 // ID for the menu commands
 };
 
 // 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_
 
 #endif
     // _WX_TYPETEST_H_