Fixes to allow compilation with no wchar_t (djgpp probably has a real wchar_t

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

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 44042da02f27dde48fbc881172beb55d666eb8d7..8c1d2b4030bfbfa2ae9292d620141dbd6a84ac39 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -64,6 +64,9 @@ MyDialog::MyDialog(wxWindow* parent, const wxWindowID id, const wxString& title,
 MyDialog::~MyDialog()
 {
     delete m_taskBarIcon;
 MyDialog::~MyDialog()
 {
     delete m_taskBarIcon;

+#if defined(__WXCOCOA__)
+    delete m_dockIcon;
+#endif

 }
 
 void MyDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyDialog::OnOK(wxCommandEvent& WXUNUSED(event))


@@ -94,6 +97,9 @@ void MyDialog::Init(void)
   Centre(wxBOTH);
    
   m_taskBarIcon = new MyTaskBarIcon();
   Centre(wxBOTH);
    
   m_taskBarIcon = new MyTaskBarIcon();

+#if defined(__WXCOCOA__)
+  m_dockIcon = new MyTaskBarIcon(wxTaskBarIcon::DOCK);
+#endif

   if (!m_taskBarIcon->SetIcon(wxICON(sample), wxT("wxTaskBarIcon Sample")))
         wxMessageBox(wxT("Could not set icon."));
 }
   if (!m_taskBarIcon->SetIcon(wxICON(sample), wxT("wxTaskBarIcon Sample")))
         wxMessageBox(wxT("Could not set icon."));
 }


@@ -103,6 +109,7 @@ enum {
     PU_RESTORE = 10001,
     PU_NEW_ICON,
     PU_EXIT,
     PU_RESTORE = 10001,
     PU_NEW_ICON,
     PU_EXIT,

+    PU_CHECKMARK

 };
 
 
 };
 
 


@@ -110,8 +117,9 @@ BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
     EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)
     EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)
     EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)
     EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)

-    EVT_TASKBAR_RIGHT_UP     (MyTaskBarIcon::OnRButtonUp)
-    EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLButtonDClick)
+    EVT_MENU(PU_CHECKMARK,MyTaskBarIcon::OnMenuCheckmark)
+    EVT_UPDATE_UI(PU_CHECKMARK,MyTaskBarIcon::OnMenuUICheckmark)
+    EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLeftButtonDClick)

 END_EVENT_TABLE()
 
 void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
 END_EVENT_TABLE()
 
 void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )


@@ -122,11 +130,17 @@ void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
 void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {
     dialog->Close(true);
 void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {
     dialog->Close(true);

+}

 
 

-    // Nudge wxWidgets into destroying the dialog, since
-    // with a hidden window no messages will get sent to put
-    // it into idle processing.
-    wxGetApp().ProcessIdle();
+static bool check = true;
+
+void MyTaskBarIcon::OnMenuCheckmark(wxCommandEvent& )
+{
+       check =!check;
+}
+void MyTaskBarIcon::OnMenuUICheckmark(wxUpdateUIEvent &event)
+{
+       event.Check( check );

 }
 
 void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
 }
 
 void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)


@@ -138,18 +152,19 @@ void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
 }
 
 // Overridables
 }
 
 // Overridables

-void MyTaskBarIcon::OnRButtonUp(wxEvent&)
+wxMenu *MyTaskBarIcon::CreatePopupMenu()

 {
 {

-    wxMenu      menu;
-
-    menu.Append(PU_RESTORE, _T("&Restore TBTest"));
-    menu.Append(PU_NEW_ICON,_T("&Set New Icon"));
-    menu.Append(PU_EXIT,    _T("E&xit"));
-
-    PopupMenu(&menu);
+    wxMenu *menu = new wxMenu;
+    
+    menu->Append(PU_RESTORE, _T("&Restore TBTest"));
+    menu->Append(PU_NEW_ICON,_T("&Set New Icon"));
+    menu->Append(PU_CHECKMARK,  _T("Checkmark"),wxT( "" ), wxITEM_CHECK );
+    menu->Append(PU_EXIT,    _T("E&xit"));
+
+    return menu;

 }
 
 }
 

-void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
+void MyTaskBarIcon::OnLeftButtonDClick(wxTaskBarIconEvent&)

 {
     dialog->Show(true);
 }
 {
     dialog->Show(true);
 }