attempts to fix recursive mutex initialized detection under RedHat 7.1 (new glibc)

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

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 42ceee2723507d2e61e1df5e08257ba5d1b16a9c..cf03cdd6da26f6ece1ca2c796677995ea9fe647e 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -17,10 +17,10 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx.h"
+#include <wx/wx.h>

 #endif
 
 #endif
 

-#include "wx/msw/taskbar.h"
+#include <wx/msw/taskbar.h>

 #include "tbtest.h"
 
 // Declare two frames
 #include "tbtest.h"
 
 // Declare two frames


@@ -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);
 


@@ -47,6 +47,7 @@ bool MyApp::OnInit(void)
 BEGIN_EVENT_TABLE(MyDialog, wxDialog)
     EVT_BUTTON(wxID_OK, MyDialog::OnOK)
     EVT_BUTTON(wxID_EXIT, MyDialog::OnExit)
 BEGIN_EVENT_TABLE(MyDialog, wxDialog)
     EVT_BUTTON(wxID_OK, MyDialog::OnOK)
     EVT_BUTTON(wxID_EXIT, MyDialog::OnExit)

+    EVT_CLOSE(MyDialog::OnCloseWindow)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


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

+    PU_NEW_ICON,

     PU_EXIT,
 };
 
     PU_EXIT,
 };
 


@@ -100,18 +102,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&)


@@ -135,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);