checked in forgottern parts of MSLU changes

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

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 74a7200000d814d03282d43487a8187a550ebf1d..2fcadd54c41c9646da75b079ad30ada7ef43af40 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);
 


@@ -76,24 +76,21 @@ void MyDialog::OnCloseWindow(wxCloseEvent& event)
 
 void MyDialog::Init(void)
 {
 
 void MyDialog::Init(void)
 {

-  int dialogWidth = 365;
-  int dialogHeight = 290;
+  (void)new wxStaticText(this, -1, "Press OK to hide me, Exit to quit.",
+                         wxPoint(10, 20));

 
 

-  wxStaticText* stat = new wxStaticText(this, -1, "Press OK to hide me, Exit to quit.",
-    wxPoint(10, 20));
+  (void)new wxStaticText(this, -1, "Double-click on the taskbar icon to show me again.",
+                         wxPoint(10, 40));

 
 

-  wxStaticText* stat2 = new wxStaticText(this, -1, "Double-click on the taskbar icon to show me again.",
-    wxPoint(10, 40));
-
-  wxButton *okButton = new wxButton(this, wxID_OK, "OK", wxPoint(100, 230), wxSize(80, 25));
-  wxButton *exitButton = new wxButton(this, wxID_EXIT, "Exit", wxPoint(185, 230), wxSize(80, 25));
-  okButton->SetDefault();
-  this->Centre(wxBOTH);
+  (void)new wxButton(this, wxID_EXIT, "Exit", wxPoint(185, 230), wxSize(80, 25));
+  (new wxButton(this, wxID_OK, "OK", wxPoint(100, 230), wxSize(80, 25)))->SetDefault();
+  Centre(wxBOTH);

 }
 
 
 enum {
     PU_RESTORE = 10001,
 }
 
 
 enum {
     PU_RESTORE = 10001,

+    PU_NEW_ICON,

     PU_EXIT,
 };
 
     PU_EXIT,
 };
 


@@ -101,18 +98,33 @@ 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()
 
 END_EVENT_TABLE()
 

-void MyTaskBarIcon::OnMenuRestore(wxEvent& )
+void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )

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

-void MyTaskBarIcon::OnMenuExit(wxEvent& )
+void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )

 {
     dialog->Close(TRUE);
 {
     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 +148,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);