USE_OPENGL is 0 by default

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

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 8e868f2a82a7733651352032ed3a970a6a091db3..21ce1733860ff8b22febc6e95d2200dbb2f9581d 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -20,7 +20,12 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #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 "mondrian.xpm"
+#endif
+
+#include "wx/taskbar.h"

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


@@ -30,9 +35,7 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit(void)
 {
 
 bool MyApp::OnInit(void)
 {

-    wxIcon icon(wxT("mondrian_icon"));
-
-    if (!m_taskBarIcon.SetIcon(icon, wxT("wxTaskBarIcon Sample")))
+    if (!m_taskBarIcon.SetIcon(wxICON(mondrian), wxT("wxTaskBarIcon Sample")))

         wxMessageBox(wxT("Could not set icon."));
 
     // Create the main frame window
         wxMessageBox(wxT("Could not set icon."));
 
     // Create the main frame window


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

-  (void)new wxStaticText(this, -1, "Press OK to hide me, Exit to quit.",
+  (void)new wxStaticText(this, -1, _T("Press OK to hide me, Exit to quit."),

                          wxPoint(10, 20));
 
                          wxPoint(10, 20));
 

-  (void)new wxStaticText(this, -1, "Double-click on the taskbar icon to show me again.",
+  (void)new wxStaticText(this, -1, _T("Double-click on the taskbar icon to show me again."),

                          wxPoint(10, 40));
 
                          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();
+  (void)new wxButton(this, wxID_EXIT, _T("Exit"), wxPoint(185, 230), wxSize(80, 25));
+  (new wxButton(this, wxID_OK, _T("OK"), wxPoint(100, 230), wxSize(80, 25)))->SetDefault();

   Centre(wxBOTH);
 }
 
   Centre(wxBOTH);
 }
 


@@ -99,6 +102,8 @@ 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_RESTORE, MyTaskBarIcon::OnMenuRestore)
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)
     EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)

+    EVT_TASKBAR_RIGHT_UP     (MyTaskBarIcon::OnRButtonUp)
+    EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLButtonDClick)

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


@@ -127,31 +132,15 @@ void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
 }
 
 // Overridables
 }
 
 // Overridables

-void MyTaskBarIcon::OnMouseMove(wxEvent&)
-{
-}
-
-void MyTaskBarIcon::OnLButtonDown(wxEvent&)
-{
-}
-
-void MyTaskBarIcon::OnLButtonUp(wxEvent&)
-{
-}
-
-void MyTaskBarIcon::OnRButtonDown(wxEvent&)
-{
-}
-

 void MyTaskBarIcon::OnRButtonUp(wxEvent&)
 {
     wxMenu      menu;
 
 void MyTaskBarIcon::OnRButtonUp(wxEvent&)
 {
     wxMenu      menu;
 

-    menu.Append(PU_RESTORE, "&Restore TBTest");
+    menu.Append(PU_RESTORE, _T("&Restore TBTest"));

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-    menu.Append(PU_NEW_ICON,"&Set New Icon");
+    menu.Append(PU_NEW_ICON,_T("&Set New Icon"));

 #endif
 #endif

-    menu.Append(PU_EXIT,    "E&xit");
+    menu.Append(PU_EXIT,    _T("E&xit"));

 
     PopupMenu(&menu);
 }
 
     PopupMenu(&menu);
 }


@@ -161,10 +150,6 @@ void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
     dialog->Show(TRUE);
 }
 
     dialog->Show(TRUE);
 }
 

-void MyTaskBarIcon::OnRButtonDClick(wxEvent&)
-{
-}
-