Add wxBITMAP_PNG() macro similar to wxBITMAP() but for PNG images.

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

diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h
index 0b1ca03b17baaf9db016b8f5a4dc6de020c35a1e..504ad26697a9907aeb02d0056586c7c3e8e978b3 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,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#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);
@@ -74,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,