Remove wxRTTI macro for wxComboBox from Motif port.

[wxWidgets.git] / samples / taskbar / tbtest.h

diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h
index a5674e56b1cf1dabcca94e415504b3c672c4eef7..d667df9186fc8d923a3f431b888ce6509915586f 100644 (file)
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -9,11 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-class MyTaskBarIcon: public wxTaskBarIcon
+class MyTaskBarIcon : public wxTaskBarIcon
 {
 public:
-#if defined(__WXCOCOA__)
-    MyTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE)
+#if defined(__WXOSX__) && wxOSX_USE_COCOA
+    MyTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE)
     :   wxTaskBarIcon(iconType)
 #else
     MyTaskBarIcon()
@@ -24,38 +24,38 @@ public:
     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
     void OnMenuSetNewIcon(wxCommandEvent&);
-       void OnMenuCheckmark(wxCommandEvent&);
-       void OnMenuUICheckmark(wxUpdateUIEvent&);
+    void OnMenuCheckmark(wxCommandEvent&);
+    void OnMenuUICheckmark(wxUpdateUIEvent&);
+    void OnMenuSub(wxCommandEvent&);
     virtual wxMenu *CreatePopupMenu();
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 
 // Define a new application
-class MyApp: public wxApp
+class MyApp : public wxApp
 {
 public:
-    bool OnInit(void);
+    virtual bool OnInit();
 };
 
 class MyDialog: public wxDialog
 {
 public:
-    MyDialog(wxWindow* parent, const wxWindowID id, const wxString& title,
-        const wxPoint& pos, const wxSize& size, const long windowStyle = wxDEFAULT_DIALOG_STYLE);
-    ~MyDialog();
+    MyDialog(const wxString& title);
+    virtual ~MyDialog();
 
+protected:
+    void OnAbout(wxCommandEvent& event);
     void OnOK(wxCommandEvent& event);
     void OnExit(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
-    void Init(void);
 
-protected:
     MyTaskBarIcon   *m_taskBarIcon;
-#if defined(__WXCOCOA__)
+#if defined(__WXOSX__) && wxOSX_USE_COCOA
     MyTaskBarIcon   *m_dockIcon;
 #endif
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };