Fixed OS/2 compilation problems.

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

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 7618108bc6e188719b2440d5cbf1e4bff41b63b8..2fcadd54c41c9646da75b079ad30ada7ef43af40 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,24 +30,28 @@ 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);
 
     return TRUE;
 }
 
 
     dialog->Show(TRUE);
 
     return TRUE;
 }
 

+

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

+
+

 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)


@@ -72,49 +76,95 @@ 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));
+
+  (void)new wxStaticText(this, -1, "Double-click on the taskbar icon to show me again.",
+                         wxPoint(10, 40));
+
+  (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,
+    PU_NEW_ICON,
+    PU_EXIT,
+};
+
+
+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& )
+{
+    dialog->Show(TRUE);
+}

 
 

-  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));
+void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
+{
+    dialog->Close(TRUE);

 
 

-  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);
+    // 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
 }
 
 // Overridables

-void MyTaskBarIcon::OnMouseMove(void)
+void MyTaskBarIcon::OnMouseMove(wxEvent&)

 {
 }
 
 {
 }
 

-void MyTaskBarIcon::OnLButtonDown(void)
+void MyTaskBarIcon::OnLButtonDown(wxEvent&)

 {
 }
 
 {
 }
 

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

 {
 }
 
 {
 }
 

-void MyTaskBarIcon::OnRButtonDown(void)
+void MyTaskBarIcon::OnRButtonDown(wxEvent&)

 {
 }
 
 {
 }
 

-void MyTaskBarIcon::OnRButtonUp(void)
+void MyTaskBarIcon::OnRButtonUp(wxEvent&)

 {
 {

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

 }
 
 }
 

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

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

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

 {
 }
 
 
 {
 }
 
 

+
+