projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a class for parsing simple markup.
[wxWidgets.git]
/
include
/
wx
/
unix
/
taskbarx11.h
diff --git
a/include/wx/unix/taskbarx11.h
b/include/wx/unix/taskbarx11.h
index ce9b661a85b1dcc8c150ed64a99e20f1b4bda09e..eb57d5766bd87316b0b1d4dd386653d32edb0153 100644
(file)
--- a/
include/wx/unix/taskbarx11.h
+++ b/
include/wx/unix/taskbarx11.h
@@
-9,18
+9,12
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////
-#ifndef _TASKBAR_H_
-#define _TASKBAR_H_
+#ifndef _
WX_UNIX_
TASKBAR_H_
+#define _
WX_UNIX_
TASKBAR_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "taskbarx11.h"
-#endif
+class WXDLLIMPEXP_FWD_ADV wxTaskBarIconArea;
-class WXDLLEXPORT wxIcon;
-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindow;
-
-class WXDLLEXPORT wxTaskBarIcon: public wxTaskBarIconBase
+class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
{
public:
wxTaskBarIcon();
{
public:
wxTaskBarIcon();
@@
-36,11
+30,12
@@
public:
bool PopupMenu(wxMenu *menu);
protected:
bool PopupMenu(wxMenu *menu);
protected:
- wxFrame *m_iconWnd;
- wxWindow *m_iconArea;
+ wxTaskBarIconArea *m_iconWnd;
+
+private:
+ void OnDestroy(wxWindowDestroyEvent&);
DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
};
DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
};
-#endif
- // _TASKBAR_H_
+#endif // _WX_UNIX_TASKBAR_H_