more work on wxDC reorganizing

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

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index fd832b1e4d13a23d3284ff2802113bce46d4ef30..fcda0b64e3d0b5c9ef208b78952a4111f3ab9a80 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -37,6 +37,9 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit(void)
 {
 
 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));
 
     // Create the main frame window
     dialog = new MyDialog(NULL, wxID_ANY, wxT("wxTaskBarIcon Test Dialog"), wxDefaultPosition, wxSize(365, 290));
 


@@ -53,7 +56,6 @@ BEGIN_EVENT_TABLE(MyDialog, wxDialog)
 END_EVENT_TABLE()
 
 
 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)
 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)


@@ -64,6 +66,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 +99,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."));
 }


@@ -102,7 +110,12 @@ void MyDialog::Init(void)
 enum {
     PU_RESTORE = 10001,
     PU_NEW_ICON,
 enum {
     PU_RESTORE = 10001,
     PU_NEW_ICON,

+    PU_OLD_ICON,

     PU_EXIT,
     PU_EXIT,

+    PU_CHECKMARK,
+    PU_SUB1,
+    PU_SUB2,
+    PU_SUBMAIN

 };
 
 
 };
 
 


@@ -110,7 +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_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)
     EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)

-    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& )
 END_EVENT_TABLE()
 
 void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )


@@ -121,11 +139,18 @@ void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
 void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {
     dialog->Close(true);
 void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {
     dialog->Close(true);

+}
+
+static bool check = true;
+
+void MyTaskBarIcon::OnMenuCheckmark(wxCommandEvent& )
+{
+       check =!check;
+}

 
 

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

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


@@ -136,19 +161,49 @@ void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
         wxMessageBox(wxT("Could not set new icon."));
 }
 
         wxMessageBox(wxT("Could not set new icon."));
 }
 

+void MyTaskBarIcon::OnMenuSetOldIcon(wxCommandEvent&)
+{
+    if (IsIconInstalled())
+    {
+        RemoveIcon();
+    }
+    else
+    {
+        wxMessageBox(wxT("wxTaskBarIcon Sample - icon already is the old version"));
+    }
+}
+
+void MyTaskBarIcon::OnMenuSub(wxCommandEvent&)
+{
+    wxMessageBox(wxT("You clicked on a submenu!"));
+}
+

 // Overridables
 wxMenu *MyTaskBarIcon::CreatePopupMenu()
 {
 // Overridables
 wxMenu *MyTaskBarIcon::CreatePopupMenu()
 {

+    // Try creating menus different ways
+    // TODO: Probably try calling SetBitmap with some XPMs here

     wxMenu *menu = new wxMenu;
     wxMenu *menu = new wxMenu;

-    

     menu->Append(PU_RESTORE, _T("&Restore TBTest"));
     menu->Append(PU_RESTORE, _T("&Restore TBTest"));

-    menu->Append(PU_NEW_ICON,_T("&Set New Icon"));
+    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"));
     menu->Append(PU_EXIT,    _T("E&xit"));

-
+#endif

     return menu;
 }
 
     return menu;
 }
 

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

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