Fix setting frame icon when using non-standard icon sizes in wxMSW.

[wxWidgets.git] / interface / wx / taskbar.h

diff --git a/interface/wx/taskbar.h b/interface/wx/taskbar.h
index c159284623f10b5ef09453e83b2b73faf713e4b4..b6c37da4f7bc8900e0a51b58a787609601a17531 100644 (file)
--- a/interface/wx/taskbar.h
+++ b/interface/wx/taskbar.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxTaskBarIcon
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxTaskBarIcon
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -48,24 +48,24 @@ public:
     The user should be required to explicitly enable the taskbar icon on Unix,
     it shouldn't be on by default.
 
     The user should be required to explicitly enable the taskbar icon on Unix,
     it shouldn't be on by default.
 

-    @beginEventTable{wxTaskBarIconEvent}
+    @beginEventEmissionTable{wxTaskBarIconEvent}

     Note that not all ports are required to send these events and so it's better
     to override wxTaskBarIcon::CreatePopupMenu() if all that the application does
     is that it shows a popup menu in reaction to mouse click.
     @event{EVT_TASKBAR_MOVE(func)}
     Note that not all ports are required to send these events and so it's better
     to override wxTaskBarIcon::CreatePopupMenu() if all that the application does
     is that it shows a popup menu in reaction to mouse click.
     @event{EVT_TASKBAR_MOVE(func)}

-        Process a wxEVT_TASKBAR_MOVE event.
+        Process a @c wxEVT_TASKBAR_MOVE event.

     @event{EVT_TASKBAR_LEFT_DOWN(func)}
     @event{EVT_TASKBAR_LEFT_DOWN(func)}

-        Process a wxEVT_TASKBAR_LEFT_DOWN event.
+        Process a @c wxEVT_TASKBAR_LEFT_DOWN event.

     @event{EVT_TASKBAR_LEFT_UP(func)}
     @event{EVT_TASKBAR_LEFT_UP(func)}

-        Process a wxEVT_TASKBAR_LEFT_UP event.
+        Process a @c wxEVT_TASKBAR_LEFT_UP event.

     @event{EVT_TASKBAR_RIGHT_DOWN(func)}
     @event{EVT_TASKBAR_RIGHT_DOWN(func)}

-        Process a wxEVT_TASKBAR_RIGHT_DOWN event.
+        Process a @c wxEVT_TASKBAR_RIGHT_DOWN event.

     @event{EVT_TASKBAR_RIGHT_UP(func)}
     @event{EVT_TASKBAR_RIGHT_UP(func)}

-        Process a wxEVT_TASKBAR_RIGHT_UP event.
+        Process a @c wxEVT_TASKBAR_RIGHT_UP event.

     @event{EVT_TASKBAR_LEFT_DCLICK(func)}
     @event{EVT_TASKBAR_LEFT_DCLICK(func)}

-        Process a wxEVT_TASKBAR_LEFT_DCLICK event.
+        Process a @c wxEVT_TASKBAR_LEFT_DCLICK event.

     @event{EVT_TASKBAR_RIGHT_DCLICK(func)}
     @event{EVT_TASKBAR_RIGHT_DCLICK(func)}

-        Process a wxEVT_TASKBAR_RIGHT_DCLICK event.
+        Process a @c wxEVT_TASKBAR_RIGHT_DCLICK event.

     @event{EVT_TASKBAR_CLICK(func)}
         This is a synonym for either EVT_TASKBAR_RIGHT_DOWN or UP depending on
         the platform, use this event macro to catch the event which should result
     @event{EVT_TASKBAR_CLICK(func)}
         This is a synonym for either EVT_TASKBAR_RIGHT_DOWN or UP depending on
         the platform, use this event macro to catch the event which should result


@@ -167,3 +167,14 @@ protected:
     virtual wxMenu* CreatePopupMenu();
 };
 
     virtual wxMenu* CreatePopupMenu();
 };
 

+
+wxEventType wxEVT_TASKBAR_MOVE;
+wxEventType wxEVT_TASKBAR_LEFT_DOWN;
+wxEventType wxEVT_TASKBAR_LEFT_UP;
+wxEventType wxEVT_TASKBAR_RIGHT_DOWN;
+wxEventType wxEVT_TASKBAR_RIGHT_UP;
+wxEventType wxEVT_TASKBAR_LEFT_DCLICK;
+wxEventType wxEVT_TASKBAR_RIGHT_DCLICK;
+wxEventType wxEVT_TASKBAR_CLICK;
+wxEventType wxEVT_TASKBAR_BALLOON_TIMEOUT;
+wxEventType wxEVT_TASKBAR_BALLOON_CLICK;