(harmless) eVC4 warning fix

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

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 74a7200000d814d03282d43487a8187a550ebf1d..8c1d2b4030bfbfa2ae9292d620141dbd6a84ac39 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".


@@ -17,10 +17,17 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

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

 #endif
 
 #endif
 

-#include <wx/msw/taskbar.h>
+// the application icon (under Windows and OS/2 it is in resources)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+    #include "../sample.xpm"
+#endif
+
+#include "smile.xpm"
+
+#include "wx/taskbar.h"

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


@@ -30,17 +37,12 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit(void)
 {
 
 bool MyApp::OnInit(void)
 {

-    wxIcon icon("mondrian_icon");
-
-    if (!m_taskBarIcon.SetIcon(icon, "wxTaskBarIcon Sample"))
-        wxMessageBox("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, wxID_ANY, wxT("wxTaskBarIcon Test Dialog"), wxDefaultPosition, wxSize(365, 290));

 
 

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

 
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -59,97 +61,110 @@ MyDialog::MyDialog(wxWindow* parent, const wxWindowID id, const wxString& title,
     Init();
 }
 
     Init();
 }
 

-void MyDialog::OnOK(wxCommandEvent& event)
+MyDialog::~MyDialog()
+{
+    delete m_taskBarIcon;
+#if defined(__WXCOCOA__)
+    delete m_dockIcon;
+#endif
+}
+
+void MyDialog::OnOK(wxCommandEvent& WXUNUSED(event))

 {
 {

-    Show(FALSE);
+    Show(false);

 }
 
 }
 

-void MyDialog::OnExit(wxCommandEvent& event)
+void MyDialog::OnExit(wxCommandEvent& WXUNUSED(event))

 {
 {

-    Close(TRUE);
+    Close(true);

 }
 
 }
 

-void MyDialog::OnCloseWindow(wxCloseEvent& event)
+void MyDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
     Destroy();
 }
 
 void MyDialog::Init(void)
 {
 {
     Destroy();
 }
 
 void MyDialog::Init(void)
 {

-  int dialogWidth = 365;
-  int dialogHeight = 290;
-
-  wxStaticText* stat = new wxStaticText(this, -1, "Press OK to hide me, Exit to quit.",
-    wxPoint(10, 20));
-
-  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 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("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."));

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

+    PU_NEW_ICON,

     PU_EXIT,
     PU_EXIT,

+    PU_CHECKMARK

 };
 
 
 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)
+    EVT_MENU(PU_CHECKMARK,MyTaskBarIcon::OnMenuCheckmark)
+    EVT_UPDATE_UI(PU_CHECKMARK,MyTaskBarIcon::OnMenuUICheckmark)
+    EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLeftButtonDClick)

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

 }
 
 }
 

+static bool check = true;

 
 

-// Overridables
-void MyTaskBarIcon::OnMouseMove(wxEvent&)
+void MyTaskBarIcon::OnMenuCheckmark(wxCommandEvent& )

 {
 {

+       check =!check;

 }
 }

-
-void MyTaskBarIcon::OnLButtonDown(wxEvent&)
+void MyTaskBarIcon::OnMenuUICheckmark(wxUpdateUIEvent &event)

 {
 {

+       event.Check( check );

 }
 
 }
 

-void MyTaskBarIcon::OnLButtonUp(wxEvent&)
+void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)

 {
 {

-}
+    wxIcon icon(smile_xpm);

 
 

-void MyTaskBarIcon::OnRButtonDown(wxEvent&)
-{
+    if (!SetIcon(icon, wxT("wxTaskBarIcon Sample - a different icon")))
+        wxMessageBox(wxT("Could not set new icon."));

 }
 
 }
 

-void MyTaskBarIcon::OnRButtonUp(wxEvent&)
-{
-    wxMenu      menu;
-
-    menu.Append(PU_RESTORE, "&Restore TBTest");
-    menu.Append(PU_EXIT,    "E&xit");
-
-    PopupMenu(&menu);
-}
-
-void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
+// Overridables
+wxMenu *MyTaskBarIcon::CreatePopupMenu()

 {
 {

-    dialog->Show(TRUE);
+    wxMenu *menu = new wxMenu;
+    
+    menu->Append(PU_RESTORE, _T("&Restore TBTest"));
+    menu->Append(PU_NEW_ICON,_T("&Set New Icon"));
+    menu->Append(PU_CHECKMARK,  _T("Checkmark"),wxT( "" ), wxITEM_CHECK );
+    menu->Append(PU_EXIT,    _T("E&xit"));
+
+    return menu;

 }
 
 }
 

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

 {
 {

+    dialog->Show(true);

 }
 }

-
-
-
-