compilation fix

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

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 98c06585364dd32265cdccfb4d8155fd6fca24b8..cf03cdd6da26f6ece1ca2c796677995ea9fe647e 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -30,13 +30,13 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit(void)
 {
 
 bool MyApp::OnInit(void)
 {

-    wxIcon icon("mondrian_icon");
+    wxIcon icon(wxT("mondrian_icon"));

 
 

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

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

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

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


@@ -94,6 +94,7 @@ void MyDialog::Init(void)
 
 enum {
     PU_RESTORE = 10001,
 
 enum {
     PU_RESTORE = 10001,

+    PU_NEW_ICON,

     PU_EXIT,
 };
 
     PU_EXIT,
 };
 


@@ -101,6 +102,7 @@ enum {
 BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
     EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)
 BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
     EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)

+    EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)

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


@@ -111,8 +113,22 @@ void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
 void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {
     dialog->Close(TRUE);
 void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {
     dialog->Close(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::OnMenuSetNewIcon(wxCommandEvent&)
+{
+#ifdef __WXMSW__
+    wxIcon icon(wxT("wxDEFAULT_FRAME"));
+
+    if (!SetIcon(icon, wxT("wxTaskBarIcon Sample")))
+        wxMessageBox(wxT("Could not set new icon."));
+#endif
+}

 
 // Overridables
 void MyTaskBarIcon::OnMouseMove(wxEvent&)
 
 // Overridables
 void MyTaskBarIcon::OnMouseMove(wxEvent&)


@@ -136,6 +152,9 @@ void MyTaskBarIcon::OnRButtonUp(wxEvent&)
     wxMenu      menu;
 
     menu.Append(PU_RESTORE, "&Restore TBTest");
     wxMenu      menu;
 
     menu.Append(PU_RESTORE, "&Restore TBTest");

+#ifdef __WXMSW__
+    menu.Append(PU_NEW_ICON,"&Set New Icon");
+#endif

     menu.Append(PU_EXIT,    "E&xit");
 
     PopupMenu(&menu);
     menu.Append(PU_EXIT,    "E&xit");
 
     PopupMenu(&menu);