use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGet...

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

diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h
index 481b26ff346c48e9a9f2be8241615dd77b840e09..f5bab25a777695c1185b66692f1c4ab97fcc0880 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,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "typetest.h"
 #endif
 
@@ -25,17 +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; }
@@ -80,6 +81,9 @@ enum
     TYPES_STREAM2,
     TYPES_STREAM3,
     TYPES_STREAM4,
+    TYPES_STREAM5,
+    TYPES_STREAM6,
+    TYPES_STREAM7,
     TYPES_MIME
 };