X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3409ae175652cdbebb54bb0ed6d575a5b3b0a64d..0ebd9515e5df4a756d27eea9ea9ee9ac193dd7bd:/samples/typetest/typetest.h

diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h
index 2fa8ab0e0c..504ad26697 100644
--- 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,10 +21,6 @@ public:
     bool OnInit();
     int OnExit() { delete m_mimeDatabase; return wxApp::OnExit(); }
 
-#if wxUSE_TIMEDATE
-    void DoDateDemo(wxCommandEvent& event);
-#endif // wxUSE_TIMEDATE
-    void DoTimeDemo(wxCommandEvent& event);
     void DoVariantDemo(wxCommandEvent& event);
     void DoByteOrderDemo(wxCommandEvent& event);
     void DoStreamDemo(wxCommandEvent& event);
@@ -36,6 +28,8 @@ public:
     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 // wxUSE_UNICODE
@@ -72,9 +66,9 @@ 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,
@@ -84,6 +78,8 @@ enum
     TYPES_STREAM3,
     TYPES_STREAM4,
     TYPES_STREAM5,
+    TYPES_STREAM6,
+    TYPES_STREAM7,
     TYPES_MIME
 };