// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "taskbar.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include <string.h>
#include "wx/taskbar.h"
-#ifdef __GNUWIN32_OLD__
- #include "wx/msw/gnuwin32/extra.h"
-#endif
-
#ifdef __WXWINCE__
#include <winreg.h>
#include <shellapi.h>
{
public:
wxTaskBarIconWindow(wxTaskBarIcon *icon)
- : wxFrame(NULL, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0),
+ : wxFrame(NULL, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0),
m_icon(icon)
{
}
-
+
WXLRESULT MSWWindowProc(WXUINT msg,
WXWPARAM wParam, WXLPARAM lParam)
{
wxTaskBarIcon *m_icon;
};
-
+
// ----------------------------------------------------------------------------
// NotifyIconData: wrapper around NOTIFYICONDATA
// ----------------------------------------------------------------------------
// Operations
bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
{
- // NB: we have to create the window lazily because of backward compatiblity,
- // old aplications may create wxTaskBarIcon instance before wxApp
+ // NB: we have to create the window lazily because of backward compatibility,
+ // old applications may create a wxTaskBarIcon instance before wxApp
// is initialized (as samples/taskbar used to do)
if (!m_win)
{
wxGetMousePosition(&x, &y);
m_win->Move(x, y);
-
+
m_win->PushEventHandler(this);
menu->UpdateUI();
static bool s_registered = false;
if ( !s_registered )
- {
+ {
// Taskbar restart msg will be sent to us if the icon needs to be redrawn
gs_msgRestartTaskbar = RegisterWindowMessage(wxT("TaskbarCreated"));