updates to taskbar sample to use events instead of virtuals and work under Unix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/taskbar/mondrian.xpm b/samples/taskbar/mondrian.xpm
new file mode 100644 (file)
index 0000000..f1846ef
--- /dev/null
+++ b/samples/taskbar/mondrian.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * mondrian_xpm[] = {
+"16 16 15 1",
+"      c None",
+".     c #400000",
+"+     c #800000",
+"@     c #808080",
+"#     c #404040",
+"$     c #FF0000",
+"%     c #FFFFFF",
+"&     c #000040",
+"*     c #000080",
+"=     c #0000FF",
+"-     c #808000",
+";     c #003000",
+">     c #006000",
+",     c #FFFF00",
+"'     c #00BF00",
+".++.@@@@@@@@@@@#",
+"+$$+%%%%%%%%%%%@",
+"+$$+%%%%%%%%%%%@",
+"+$$+%%%%%%%%%%%@",
+"#@@#@@@@@@@@@&*&",
+"@%%@%%%%%%%%%*=*",
+"@%%@%%%%%%%%%*=*",
+"@%%@%%%%%%%%%#@#",
+"@%%@%%%%%%%%%@%@",
+"@%%@%%%%%%%%%@%@",
+"@%%@%%%%%%%%%@%@",
+"@%%@%%%%%%%%%@%@",
+"@%%@------;>>@%@",
+"@%%@,,,,,,>''@%@",
+"@%%@,,,,,,>''@%@",
+"#@@#------;>>#@#"};

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index ec3b5cd011d7162a53b47d7c1f5aad95b7bed90d..21ce1733860ff8b22febc6e95d2200dbb2f9581d 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -20,6 +20,11 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

+// 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"
 
 #include "wx/taskbar.h"
 #include "tbtest.h"
 


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


@@ -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,22 +132,6 @@ 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;


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

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

 
 
 
 
 
 

diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h
index 64e141f546464b1afd7ad2f5be17cab3067ab73f..a3ce1b2940e9f1aba33db24202a9a33fb5ce34f5 100644 (file)
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -14,14 +14,8 @@ class MyTaskBarIcon: public wxTaskBarIcon
 public:
     MyTaskBarIcon() {};
 
 public:
     MyTaskBarIcon() {};
 

-    virtual void OnMouseMove(wxEvent&);
-    virtual void OnLButtonDown(wxEvent&);
-    virtual void OnLButtonUp(wxEvent&);
-    virtual void OnRButtonDown(wxEvent&);
-    virtual void OnRButtonUp(wxEvent&);
-    virtual void OnLButtonDClick(wxEvent&);
-    virtual void OnRButtonDClick(wxEvent&);
-
+    void OnRButtonUp(wxEvent&);
+    void OnLButtonDClick(wxEvent&);

     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
     void OnMenuSetNewIcon(wxCommandEvent&);
     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
     void OnMenuSetNewIcon(wxCommandEvent&);

diff --git a/samples/taskbar/tbtest.rc b/samples/taskbar/tbtest.rc
index 78d638416a9484b518cdc24a8918c7d4937ea177..7655c62a4c3f71bc6ddb1499a59ec06d57cf29e2 100644 (file)
--- a/samples/taskbar/tbtest.rc
+++ b/samples/taskbar/tbtest.rc
@@ -1,4 +1,3 @@
-mondrian_icon ICON "mondrian.ico"
-wxDEFAULT_FRAME ICON "wx/msw/std.ico"
+mondrian ICON "mondrian.ico"

 #include "wx/msw/wx.rc"
 
 #include "wx/msw/wx.rc"