X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6af507f77e563a71f8935f67c9c8a9054309d26d..199da884d77a29edc7c3099d9afc9d3a5c051794:/docs/latex/wx/taskbar.tex

diff --git a/docs/latex/wx/taskbar.tex b/docs/latex/wx/taskbar.tex
index 48c6a5b31a..be42f21d54 100644
--- a/docs/latex/wx/taskbar.tex
+++ b/docs/latex/wx/taskbar.tex
@@ -1,7 +1,22 @@
 \section{\class{wxTaskBarIcon}}\label{wxtaskbaricon}
 
-This class represents a Windows 95 taskbar icon, appearing in the `system tray' and responding to
-mouse clicks. An icon has an optional tooltip. This class is only supported for Windows 95/NT.
+This class represents a taskbar icon. A taskbar icon is an icon that appears in the `system tray' and responds to mouse clicks, optionally with a tooltip above it to help provide information.
+
+\wxheading{X Window System Note}
+
+Under X Window System, the window manager must support either
+the \urlref{System Tray Protocol by freedesktop.org}{http://freedesktop.org/Standards/systemtray-spec}
+(WMs used by modern desktop environments such as GNOME >= 2, KDE
+>= 3 and XFCE >= 4 all do) or the older methods used in GNOME 1.2 and
+KDE 1 and 2. If it doesn't, the icon will appear as a toplevel window on
+user's desktop.
+
+Because not all window managers have system tray, there's no guarantee that
+wxTaskBarIcon will work correctly under X Window System and so the applications
+should use it only as an optional component of their user interface. The user
+should be required to explicitly enable the taskbar icon on Unix, it shouldn't
+be on by default.
+
 
 \wxheading{Derived from}
 
@@ -15,7 +30,10 @@ mouse clicks. An icon has an optional tooltip. This class is only supported for
 \wxheading{Event handling}
 
 To process input from a taskbar icon, use the following event handler macros to direct input to member
-functions that take a wxTaskBarIconEvent argument.
+functions that take a wxTaskBarIconEvent argument. Note that not all ports are
+required to send these events and so it's better to override
+\helpref{CreatePopupMenu}{wxtaskbariconcreatepopupmenu} if all that
+the application does is that it shows a popup menu in reaction to mouse click.
 
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
@@ -37,18 +55,31 @@ wxEVT\_TASKBAR\_RIGHT\_DCLICK event.}
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
-\membersection{wxTaskBarIcon::wxTaskBarIcon}\label{wxtaskbariconconstr}
+\membersection{wxTaskBarIcon::wxTaskBarIcon}\label{wxtaskbariconctor}
 
 \func{}{wxTaskBarIcon}{\void}
 
 Default constructor.
 
-\membersection{wxTaskBarIcon::\destruct{wxTaskBarIcon}}
+\membersection{wxTaskBarIcon::\destruct{wxTaskBarIcon}}\label{wxtaskbaricondtor}
 
 \func{}{\destruct{wxTaskBarIcon}}{\void}
 
 Destroys the wxTaskBarIcon object, removing the icon if not already removed.
 
+\membersection{wxTaskBarIcon::CreatePopupMenu}\label{wxtaskbariconcreatepopupmenu}
+
+\func{virtual wxMenu*}{CreatePopupMenu}{\void}
+
+This method is called by the library when the user requests popup menu
+(on Windows and Unix platforms, this is when the user right-clicks the icon).
+Override this function in order to provide popup menu associated with the icon.
+
+If CreatePopupIcon returns NULL (this happens by default),
+no menu is shown, otherwise the menu is
+displayed and then deleted by the library as soon as the user dismisses it.
+The events can be handled by a class derived from wxTaskBarIcon.
+
 \membersection{wxTaskBarIcon::IsIconInstalled}\label{wxtaskbariconisiconinstalled}
 
 \func{bool}{IsIconInstalled}{\void}
@@ -61,47 +92,19 @@ Returns true if \helpref{SetIcon}{wxtaskbariconseticon} was called with no subse
 
 Returns true if the object initialized successfully.
 
-\membersection{wxTaskBarIcon::OnLButtonDown}\label{wxtaskbaricononlbuttondown}
-
-\func{virtual void}{OnLButtonDown}{\void}
-
-Override this function to intercept left mouse button down events.
-
-\membersection{wxTaskBarIcon::OnLButtonDClick}\label{wxtaskbaricononlbuttondclick}
-
-\func{virtual void}{OnLButtonDClick}{\void}
-
-Override this function to intercept left mouse button double-click events.
-
-\membersection{wxTaskBarIcon::OnLButtonUp}\label{wxtaskbaricononlbuttonup}
-
-\func{virtual void}{OnLButtonUp}{\void}
-
-Override this function to intercept left mouse button up events.
-
-\membersection{wxTaskBarIcon::OnRButtonDown}\label{wxtaskbaricononrbuttondown}
-
-\func{virtual void}{OnRButtonDown}{\void}
-
-Override this function to intercept right mouse button down events.
-
-\membersection{wxTaskBarIcon::OnRButtonDClick}\label{wxtaskbaricononrbuttondclick}
-
-\func{virtual void}{OnRButtonDClick}{\void}
-
-Override this function to intercept right mouse button double-click events.
-
-\membersection{wxTaskBarIcon::OnRButtonUp}\label{wxtaskbaricononrbuttonup}
-
-\func{virtual void}{OnRButtonUp}{\void}
+\membersection{wxTaskBarIcon::PopupMenu}\label{wxtaskbariconpopupmenu}
 
-Override this function to intercept right mouse button up events.
+\func{bool}{PopupMenu}{\param{wxMenu*}{ menu}}
 
-\membersection{wxTaskBarIcon::OnMouseMove}\label{wxtaskbaricononmousemove}
+Pops up a menu at the current mouse position. The events can be handled by
+a class derived from wxTaskBarIcon.
 
-\func{virtual void}{OnMouseMove}{\void}
+\wxheading{Note}
 
-Override this function to intercept mouse move events.
+It is recommended to override
+\helpref{CreatePopupIcon}{wxtaskbariconcreatepopupmenu}
+callback instead of calling this method from event handler, because some
+ports (e.g. wxCocoa) may not implement PopupMenu and mouse click events at all.
 
 \membersection{wxTaskBarIcon::RemoveIcon}\label{wxtaskbariconremoveicon}