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 3fdbc781a6ac7e97fcf501f6f0c84ffcd708d431..8c1d2b4030bfbfa2ae9292d620141dbd6a84ac39 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -109,6 +109,7 @@ enum {
     PU_RESTORE = 10001,
     PU_NEW_ICON,
     PU_EXIT,
     PU_RESTORE = 10001,
     PU_NEW_ICON,
     PU_EXIT,

+    PU_CHECKMARK

 };
 
 
 };
 
 


@@ -116,6 +117,8 @@ 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_MENU(PU_CHECKMARK,MyTaskBarIcon::OnMenuCheckmark)
+    EVT_UPDATE_UI(PU_CHECKMARK,MyTaskBarIcon::OnMenuUICheckmark)

     EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLeftButtonDClick)
 END_EVENT_TABLE()
 
     EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLeftButtonDClick)
 END_EVENT_TABLE()
 


@@ -129,6 +132,17 @@ void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
     dialog->Close(true);
 }
 
     dialog->Close(true);
 }
 

+static bool check = true;
+
+void MyTaskBarIcon::OnMenuCheckmark(wxCommandEvent& )
+{
+       check =!check;
+}
+void MyTaskBarIcon::OnMenuUICheckmark(wxUpdateUIEvent &event)
+{
+       event.Check( check );
+}
+

 void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
 {
     wxIcon icon(smile_xpm);
 void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
 {
     wxIcon icon(smile_xpm);


@@ -144,6 +158,7 @@ wxMenu *MyTaskBarIcon::CreatePopupMenu()
     
     menu->Append(PU_RESTORE, _T("&Restore TBTest"));
     menu->Append(PU_NEW_ICON,_T("&Set New Icon"));
     
     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;
     menu->Append(PU_EXIT,    _T("E&xit"));
 
     return menu;