From 3eae0c0b438f059635c8e26d6ddb5a8f2de42db3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 5 Apr 2003 22:25:36 +0000 Subject: [PATCH] added taskbarcmn.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/filelist.txt | 3 +++ src/common/taskbarcmn.cpp | 27 +++++++++++++++++++++++++++ src/msw/taskbar.cpp | 8 -------- 3 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 src/common/taskbarcmn.cpp diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 8a4d97d2ad..86fd9b1e84 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -230,6 +230,7 @@ strconv.cpp Common Base stream.cpp Common Base string.cpp Common Base sysopt.cpp Common Base +taskbarcmn.cpp Common tbarbase.cpp Common textbuf.cpp Common Base textcmn.cpp Common @@ -375,6 +376,7 @@ fontutil.cpp Unix NotCocoa,NotMac,NotMGL,NotMicro gsocket.c Unix Base,NotMac mimetype.cpp Unix Base,NotMac,NotMicro snglinst.cpp Unix Base +taskbarx11.cpp Unix NotMac,NotMGL,NotMicro threadpsx.cpp Unix Base,NotMac utilsunx.cpp Unix Base utilsx11.cpp Unix NotMac,NotMGL,NotMicro @@ -1544,6 +1546,7 @@ execute.h UnixH fontutil.h UnixH gsockunx.h UnixH Base mimetype.h UnixH Base +taskbarx11.h UnixH utilsx11.h UnixH file.h ProtoH Base diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp new file mode 100644 index 0000000000..0d3559c7ba --- /dev/null +++ b/src/common/taskbarcmn.cpp @@ -0,0 +1,27 @@ +///////////////////////////////////////////////////////////////////////// +// File: taskbarcmn.cpp +// Purpose: Common parts of wxTaskBarIcon class +// Author: Julian Smart +// Modified by: +// Created: 04/04/2003 +// RCS-ID: $Id$ +// Copyright: (c) Julian Smart, 2003 +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////// + +#if defined(__GNUG__) && !defined(__APPLE__) +#pragma implementation "taskbar.h" +#endif + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/taskbar.h" + +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DOWN ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_UP ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DOWN ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_UP ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DCLICK ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DCLICK ) diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index 39344c02a0..da4ab58764 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -61,14 +61,6 @@ wxTaskBarIconList wxTaskBarIcon::sm_taskBarIcons; bool wxTaskBarIcon::sm_registeredClass = FALSE; UINT wxTaskBarIcon::sm_taskbarMsg = 0; -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DOWN ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_UP ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DOWN ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_UP ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DCLICK ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DCLICK ) - #if WXWIN_COMPATIBILITY_2_4 BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler) EVT_TASKBAR_MOVE (wxTaskBarIcon::_OnMouseMove) -- 2.45.2