Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-04-05 22:20:52 +00:00
parent b78ce094c7
commit 4bc6471261
4 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
samples/taskbar/mondrian.xpm Normal file
View File

@@ -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",
".++.@@@@@@@@@@@#",
"+$$+%%%%%%%%%%%@",
"+$$+%%%%%%%%%%%@",
"+$$+%%%%%%%%%%%@",
"#@@#@@@@@@@@@&*&",
"@%%@%%%%%%%%%*=*",
"@%%@%%%%%%%%%*=*",
"@%%@%%%%%%%%%#@#",
"@%%@%%%%%%%%%@%@",
"@%%@%%%%%%%%%@%@",
"@%%@%%%%%%%%%@%@",
"@%%@%%%%%%%%%@%@",
"@%%@------;>>@%@",
"@%%@,,,,,,>''@%@",
"@%%@,,,,,,>''@%@",
"#@@#------;>>#@#"};

31
samples/taskbar/tbtest.cpp
View File

@@ -20,6 +20,11 @@
#include "wx/wx.h" #include "wx/wx.h"
#endif #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 "wx/taskbar.h"
#include "tbtest.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(wxICON(mondrian), wxT("wxTaskBarIcon Sample")))
if (!m_taskBarIcon.SetIcon(icon, wxT("wxTaskBarIcon Sample")))
wxMessageBox(wxT("Could not set icon.")); wxMessageBox(wxT("Could not set icon."));
// Create the main frame window // Create the main frame window
@@ -99,6 +102,8 @@ BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore) EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
EVT_MENU(PU_EXIT, MyTaskBarIcon::OnMenuExit) EVT_MENU(PU_EXIT, MyTaskBarIcon::OnMenuExit)
EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon) EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)
EVT_TASKBAR_RIGHT_UP (MyTaskBarIcon::OnRButtonUp)
EVT_TASKBAR_LEFT_DCLICK (MyTaskBarIcon::OnLButtonDClick)
END_EVENT_TABLE() END_EVENT_TABLE()
void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& ) 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&) void MyTaskBarIcon::OnRButtonUp(wxEvent&)
{ {
wxMenu menu; wxMenu menu;
@@ -161,10 +150,6 @@ void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
dialog->Show(TRUE); dialog->Show(TRUE);
} }
void MyTaskBarIcon::OnRButtonDClick(wxEvent&)
{
}

10
samples/taskbar/tbtest.h
View File

@@ -14,14 +14,8 @@ class MyTaskBarIcon: public wxTaskBarIcon
public: public:
MyTaskBarIcon() {}; MyTaskBarIcon() {};
virtual void OnMouseMove(wxEvent&); void OnRButtonUp(wxEvent&);
virtual void OnLButtonDown(wxEvent&); void OnLButtonDClick(wxEvent&);
virtual void OnLButtonUp(wxEvent&);
virtual void OnRButtonDown(wxEvent&);
virtual void OnRButtonUp(wxEvent&);
virtual void OnLButtonDClick(wxEvent&);
virtual void OnRButtonDClick(wxEvent&);
void OnMenuRestore(wxCommandEvent&); void OnMenuRestore(wxCommandEvent&);
void OnMenuExit(wxCommandEvent&); void OnMenuExit(wxCommandEvent&);
void OnMenuSetNewIcon(wxCommandEvent&); void OnMenuSetNewIcon(wxCommandEvent&);

3
samples/taskbar/tbtest.rc
View File

@@ -1,4 +1,3 @@
mondrian_icon ICON "mondrian.ico" mondrian ICON "mondrian.ico"
wxDEFAULT_FRAME ICON "wx/msw/std.ico"
#include "wx/msw/wx.rc" #include "wx/msw/wx.rc"