don't assert at startup because of the static initialization of a wxLocale object...

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

diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h
index a8f6124b38f11b78fe276068345a39755ae6f8aa..504ad26697a9907aeb02d0056586c7c3e8e978b3 100644 (file)
--- a/samples/typetest/typetest.h
+++ b/samples/typetest/typetest.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        typetest.h
-// Purpose:     Types wxWindows sample
+// Purpose:     Types wxWidgets sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma interface "typetest.h"
-#endif
-
 #ifndef _WX_TYPETEST_H_
 #define _WX_TYPETEST_H_
 
@@ -25,14 +21,18 @@ public:
     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);
+    void DoStreamDemo6(wxCommandEvent& event);
+    void DoStreamDemo7(wxCommandEvent& event);
 #if wxUSE_UNICODE
     void DoUnicodeDemo(wxCommandEvent& event);
-#endif
+#endif // wxUSE_UNICODE
     void DoMIMEDemo(wxCommandEvent& event);
 
     wxTextCtrl* GetTextCtrl() const { return m_textCtrl; }
@@ -66,14 +66,20 @@ enum
 {
     TYPES_QUIT = wxID_EXIT,
     TYPES_TEXT = 101,
-    TYPES_ABOUT,
+    TYPES_ABOUT = wxID_ABOUT,
 
-    TYPES_DATE,
+    TYPES_DATE = 102,
     TYPES_TIME,
     TYPES_VARIANT,
     TYPES_BYTEORDER,
     TYPES_UNICODE,
     TYPES_STREAM,
+    TYPES_STREAM2,
+    TYPES_STREAM3,
+    TYPES_STREAM4,
+    TYPES_STREAM5,
+    TYPES_STREAM6,
+    TYPES_STREAM7,
     TYPES_MIME
 };