X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3409ae175652cdbebb54bb0ed6d575a5b3b0a64d..522e2aa861080349ebc24d1d4f1553cb505b60db:/samples/typetest/typetest.h diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h index 2fa8ab0e0c..6c315508cf 100644 --- 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,10 +25,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 +32,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 @@ -84,6 +82,8 @@ enum TYPES_STREAM3, TYPES_STREAM4, TYPES_STREAM5, + TYPES_STREAM6, + TYPES_STREAM7, TYPES_MIME };