compate charset names case-insensitively in GetEncodingFromName()

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

diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h
index c7b9d15e0fb5bb57b8df84c789590895fc20dccd..5abcc3a78449fccf763ee3c93a2f4979aa22e06e 100644 (file)
--- a/samples/typetest/typetest.h
+++ b/samples/typetest/typetest.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        typetest.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        typetest.h

-// Purpose:     Types wxWindows sample
+// Purpose:     Types wxWidgets sample

 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98


@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "typetest.h"
 #endif
 
 #pragma interface "typetest.h"
 #endif
 


@@ -25,15 +25,18 @@ public:
     bool OnInit();
     int OnExit() { delete m_mimeDatabase; return wxApp::OnExit(); }
 
     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 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);
 #if wxUSE_UNICODE
     void DoUnicodeDemo(wxCommandEvent& event);

-#endif
+#endif // wxUSE_UNICODE

     void DoMIMEDemo(wxCommandEvent& event);
 
     wxTextCtrl* GetTextCtrl() const { return m_textCtrl; }
     void DoMIMEDemo(wxCommandEvent& event);
 
     wxTextCtrl* GetTextCtrl() const { return m_textCtrl; }


@@ -67,15 +70,20 @@ enum
 {
     TYPES_QUIT = wxID_EXIT,
     TYPES_TEXT = 101,
 {
     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_TIME,
     TYPES_VARIANT,
     TYPES_BYTEORDER,
     TYPES_UNICODE,
     TYPES_STREAM,
     TYPES_STREAM2,

+    TYPES_STREAM3,
+    TYPES_STREAM4,
+    TYPES_STREAM5,
+    TYPES_STREAM6,
+    TYPES_STREAM7,

     TYPES_MIME
 };
 
     TYPES_MIME
 };