fix reference to obsolete b32univ file

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

diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h
index c7b9d15e0fb5bb57b8df84c789590895fc20dccd..6c315508cff14a70646ef9c1272629183893852d 100644 (file)
--- a/samples/typetest/typetest.h
+++ b/samples/typetest/typetest.h
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "typetest.h"
 #endif
 
@@ -25,15 +25,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; }
@@ -76,6 +79,11 @@ enum
     TYPES_UNICODE,
     TYPES_STREAM,
     TYPES_STREAM2,
+    TYPES_STREAM3,
+    TYPES_STREAM4,
+    TYPES_STREAM5,
+    TYPES_STREAM6,
+    TYPES_STREAM7,
     TYPES_MIME
 };