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 21ce1733860ff8b22febc6e95d2200dbb2f9581d..8c1d2b4030bfbfa2ae9292d620141dbd6a84ac39 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -22,9 +22,11 @@
 
 // the application icon (under Windows and OS/2 it is in resources)
 #if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
 
 // the application icon (under Windows and OS/2 it is in resources)
 #if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)

-    #include "mondrian.xpm"
+    #include "../sample.xpm"

 #endif
 
 #endif
 

+#include "smile.xpm"
+

 #include "wx/taskbar.h"
 #include "tbtest.h"
 
 #include "wx/taskbar.h"
 #include "tbtest.h"
 


@@ -35,15 +37,12 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit(void)
 {
 
 bool MyApp::OnInit(void)
 {

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

     // Create the main frame window
     // Create the main frame window

-    dialog = new MyDialog(NULL, -1, wxT("wxTaskBarIcon Test Dialog"), wxPoint(-1, -1), wxSize(365, 290), wxDIALOG_MODELESS|wxDEFAULT_DIALOG_STYLE);
+    dialog = new MyDialog(NULL, wxID_ANY, wxT("wxTaskBarIcon Test Dialog"), wxDefaultPosition, wxSize(365, 290));

 
 

-    dialog->Show(TRUE);
+    dialog->Show(true);

 
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -62,32 +61,47 @@ MyDialog::MyDialog(wxWindow* parent, const wxWindowID id, const wxString& title,
     Init();
 }
 
     Init();
 }
 

-void MyDialog::OnOK(wxCommandEvent& event)
+MyDialog::~MyDialog()

 {
 {

-    Show(FALSE);
+    delete m_taskBarIcon;
+#if defined(__WXCOCOA__)
+    delete m_dockIcon;
+#endif

 }
 
 }
 

-void MyDialog::OnExit(wxCommandEvent& event)
+void MyDialog::OnOK(wxCommandEvent& WXUNUSED(event))

 {
 {

-    Close(TRUE);
+    Show(false);

 }
 
 }
 

-void MyDialog::OnCloseWindow(wxCloseEvent& event)
+void MyDialog::OnExit(wxCommandEvent& WXUNUSED(event))
+{
+    Close(true);
+}
+
+void MyDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
     Destroy();
 }
 
 void MyDialog::Init(void)
 {
 {
     Destroy();
 }
 
 void MyDialog::Init(void)
 {

-  (void)new wxStaticText(this, -1, _T("Press OK to hide me, Exit to quit."),
+  (void)new wxStaticText(this, wxID_ANY, _T("Press 'Hide me' to hide me, Exit to quit."),

                          wxPoint(10, 20));
 
                          wxPoint(10, 20));
 

-  (void)new wxStaticText(this, -1, _T("Double-click on the taskbar icon to show me again."),
+  (void)new wxStaticText(this, wxID_ANY, _T("Double-click on the taskbar icon to show me again."),

                          wxPoint(10, 40));
 
   (void)new wxButton(this, wxID_EXIT, _T("Exit"), wxPoint(185, 230), wxSize(80, 25));
                          wxPoint(10, 40));
 
   (void)new wxButton(this, wxID_EXIT, _T("Exit"), wxPoint(185, 230), wxSize(80, 25));

-  (new wxButton(this, wxID_OK, _T("OK"), wxPoint(100, 230), wxSize(80, 25)))->SetDefault();
+  (new wxButton(this, wxID_OK, _T("Hide me"), wxPoint(100, 230), wxSize(80, 25)))->SetDefault();

   Centre(wxBOTH);
   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."));

 }
 
 
 }
 
 


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

+    PU_CHECKMARK

 };
 
 
 };
 
 


@@ -102,54 +117,54 @@ 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& )
 {

-    dialog->Show(TRUE);
+    dialog->Show(true);

 }
 
 void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {
 }
 
 void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {

-    dialog->Close(TRUE);
+    dialog->Close(true);
+}
+
+static bool check = true;

 
 

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

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

-#ifdef __WXMSW__
-    wxIcon icon(wxT("wxDEFAULT_FRAME"));
+    wxIcon icon(smile_xpm);

 
 

-    if (!SetIcon(icon, wxT("wxTaskBarIcon Sample")))
+    if (!SetIcon(icon, wxT("wxTaskBarIcon Sample - a different icon")))

         wxMessageBox(wxT("Could not set new icon."));
         wxMessageBox(wxT("Could not set new icon."));

-#endif

 }
 
 // Overridables
 }
 
 // Overridables

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

 {
 {

-    wxMenu      menu;
-
-    menu.Append(PU_RESTORE, _T("&Restore TBTest"));
-#ifdef __WXMSW__
-    menu.Append(PU_NEW_ICON,_T("&Set New Icon"));
-#endif
-    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);

 }
 }

-
-
-
-