projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed property Hide command
[wxWidgets.git]
/
samples
/
taskbar
/
tbtest.h
diff --git
a/samples/taskbar/tbtest.h
b/samples/taskbar/tbtest.h
index 24ab1de7c8fce69ebc19de0b0f64bf8f0b0d0f13..df54f38dcfdd917c14cfbfa08a835e5ff9a0dd44 100644
(file)
--- a/
samples/taskbar/tbtest.h
+++ b/
samples/taskbar/tbtest.h
@@
-9,44
+9,53
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-class MyTaskBarIcon: public wxTaskBarIcon
+class MyTaskBarIcon
: public wxTaskBarIcon
{
public:
{
public:
- MyTaskBarIcon() {};
-
- void OnRButtonUp(wxEvent&);
- void OnLButtonDClick(wxEvent&);
+#if defined(__WXCOCOA__)
+ MyTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE)
+ : wxTaskBarIcon(iconType)
+#else
+ MyTaskBarIcon()
+#endif
+ {}
+
+ void OnLeftButtonDClick(wxTaskBarIconEvent&);
void OnMenuRestore(wxCommandEvent&);
void OnMenuExit(wxCommandEvent&);
void OnMenuSetNewIcon(wxCommandEvent&);
void OnMenuRestore(wxCommandEvent&);
void OnMenuExit(wxCommandEvent&);
void OnMenuSetNewIcon(wxCommandEvent&);
+ void OnMenuCheckmark(wxCommandEvent&);
+ void OnMenuUICheckmark(wxUpdateUIEvent&);
+ void OnMenuSub(wxCommandEvent&);
+ virtual wxMenu *CreatePopupMenu();
-DECLARE_EVENT_TABLE()
+
DECLARE_EVENT_TABLE()
};
// Define a new application
};
// Define a new application
-class MyApp: public wxApp
+class MyApp
: public wxApp
{
public:
{
public:
-
bool OnInit(void
);
+
virtual bool OnInit(
);
};
class MyDialog: public wxDialog
{
public:
};
class MyDialog: public wxDialog
{
public:
- MyDialog(wxWindow* parent, const wxWindowID id, const wxString& title,
- const wxPoint& pos, const wxSize& size, const long windowStyle = wxDEFAULT_DIALOG_STYLE);
- ~MyDialog();
+ MyDialog(const wxString& title);
+ virtual ~MyDialog();
+protected:
+ void OnAbout(wxCommandEvent& event);
void OnOK(wxCommandEvent& event);
void OnExit(wxCommandEvent& event);
void OnCloseWindow(wxCloseEvent& event);
void OnOK(wxCommandEvent& event);
void OnExit(wxCommandEvent& event);
void OnCloseWindow(wxCloseEvent& event);
- void Init(void);
-protected:
MyTaskBarIcon *m_taskBarIcon;
MyTaskBarIcon *m_taskBarIcon;
+#if defined(__WXCOCOA__)
+ MyTaskBarIcon *m_dockIcon;
+#endif
-DECLARE_EVENT_TABLE()
+
DECLARE_EVENT_TABLE()
};
};
-
-