#include "lib/encode_server.h"
#include "lib/config.h"
#include "lib/log.h"
-#include "lib/raw_convert.h"
#include "lib/signaller.h"
#include "lib/cross.h"
#include <wx/taskbar.h>
: _status (0)
{
#ifdef DCPOMATIC_WINDOWS
- wxIcon icon (std_to_wx ("taskbar_icon"));
+ wxIcon icon (std_to_wx ("id"));
#else
wxInitAllImageHandlers();
- wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+ wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif
SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::status, this), ID_status);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::quit, this), ID_quit);
+ Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::status, this), ID_status);
+ Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::quit, this), ID_quit);
}
wxMenu* CreatePopupMenu ()