removed dll export declaration for wxCStrData: it's unneeded because the class is...

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

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 131f17b38e74709e6874e0b82ac4b03ff7aa853a..fcda0b64e3d0b5c9ef208b78952a4111f3ab9a80 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -25,6 +25,8 @@
     #include "../sample.xpm"
 #endif
 
+#include "smile.xpm"
+
 #include "wx/taskbar.h"
 #include "tbtest.h"
 
@@ -35,8 +37,11 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit(void)
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     // Create the main frame window
-    dialog = new MyDialog(NULL, wxID_ANY, wxT("wxTaskBarIcon Test Dialog"), wxDefaultPosition, 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);
 
@@ -51,7 +56,6 @@ BEGIN_EVENT_TABLE(MyDialog, wxDialog)
 END_EVENT_TABLE()
 
 
-
 MyDialog::MyDialog(wxWindow* parent, const wxWindowID id, const wxString& title,
     const wxPoint& pos, const wxSize& size, const long windowStyle):
   wxDialog(parent, id, title, pos, size, windowStyle)
@@ -62,6 +66,9 @@ MyDialog::MyDialog(wxWindow* parent, const wxWindowID id, const wxString& title,
 MyDialog::~MyDialog()
 {
     delete m_taskBarIcon;
+#if defined(__WXCOCOA__)
+    delete m_dockIcon;
+#endif
 }
 
 void MyDialog::OnOK(wxCommandEvent& WXUNUSED(event))
@@ -81,18 +88,20 @@ void MyDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
 void MyDialog::Init(void)
 {
-  (void)new wxStaticText(this, wxID_ANY, _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));
 
   (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));
-  (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);
    
-  
   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."));
 }
@@ -101,7 +110,12 @@ void MyDialog::Init(void)
 enum {
     PU_RESTORE = 10001,
     PU_NEW_ICON,
+    PU_OLD_ICON,
     PU_EXIT,
+    PU_CHECKMARK,
+    PU_SUB1,
+    PU_SUB2,
+    PU_SUBMAIN
 };
 
 
@@ -109,8 +123,12 @@ 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_TASKBAR_RIGHT_UP     (MyTaskBarIcon::OnRButtonUp)
-    EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLButtonDClick)
+    EVT_MENU(PU_OLD_ICON,MyTaskBarIcon::OnMenuSetOldIcon)
+    EVT_MENU(PU_CHECKMARK,MyTaskBarIcon::OnMenuCheckmark)
+    EVT_UPDATE_UI(PU_CHECKMARK,MyTaskBarIcon::OnMenuUICheckmark)
+    EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLeftButtonDClick)
+    EVT_MENU(PU_SUB1, MyTaskBarIcon::OnMenuSub)
+    EVT_MENU(PU_SUB2, MyTaskBarIcon::OnMenuSub)
 END_EVENT_TABLE()
 
 void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
@@ -121,42 +139,71 @@ void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
 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&)
 {
-#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."));
-#endif
 }
 
-// Overridables
-void MyTaskBarIcon::OnRButtonUp(wxEvent&)
+void MyTaskBarIcon::OnMenuSetOldIcon(wxCommandEvent&)
 {
-    wxMenu      menu;
+    if (IsIconInstalled())
+    {
+        RemoveIcon();
+    }
+    else
+    {
+        wxMessageBox(wxT("wxTaskBarIcon Sample - icon already is the old version"));
+    }
+}
 
-    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"));
+void MyTaskBarIcon::OnMenuSub(wxCommandEvent&)
+{
+    wxMessageBox(wxT("You clicked on a submenu!"));
+}
 
-    PopupMenu(&menu);
+// Overridables
+wxMenu *MyTaskBarIcon::CreatePopupMenu()
+{
+    // Try creating menus different ways
+    // TODO: Probably try calling SetBitmap with some XPMs here
+    wxMenu *menu = new wxMenu;
+    menu->Append(PU_RESTORE, _T("&Restore TBTest"));
+    menu->AppendSeparator();
+    menu->Append(PU_OLD_ICON, _T("&Restore Old Icon"));    
+    menu->Append(PU_NEW_ICON, _T("&Set New Icon"));
+    menu->AppendSeparator();
+    menu->Append(PU_CHECKMARK, _T("Checkmark"),wxT(""), wxITEM_CHECK);
+    menu->AppendSeparator();
+    wxMenu *submenu = new wxMenu;
+    submenu->Append(PU_SUB1, _T("One submenu"));
+    submenu->AppendSeparator();
+    submenu->Append(PU_SUB2, _T("Another submenu"));
+    menu->Append(PU_SUBMAIN, _T("Submenu"), submenu);
+#ifndef __WXMAC_OSX__ /*Mac has built-in quit menu*/
+    menu->AppendSeparator();
+    menu->Append(PU_EXIT,    _T("E&xit"));
+#endif
+    return menu;
 }
 
-void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
+void MyTaskBarIcon::OnLeftButtonDClick(wxTaskBarIconEvent&)
 {
     dialog->Show(true);
 }
-
-
-
-