added taskbarcmn.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 8a4d97d2ade0cb175eb575c22a06c66e271e39c2..86fd9b1e8436520880b552abdbec015834f7fe6d 100644 (file)
--- 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
 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
 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
 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
 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
 fontutil.h     UnixH
 gsockunx.h     UnixH   Base
 mimetype.h     UnixH   Base

+taskbarx11.h   UnixH

 utilsx11.h     UnixH
 
 file.h ProtoH  Base
 utilsx11.h     UnixH
 
 file.h ProtoH  Base

diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp
new file mode 100644 (file)
index 0000000..0d3559c
--- /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 39344c02a0ec86319c6f005ae7bfbb0d21e6c3e3..da4ab58764ea18e4179e26338b6674c6c4582295 100644 (file)
--- 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;
 
 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)
 #if WXWIN_COMPATIBILITY_2_4
 BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)
     EVT_TASKBAR_MOVE         (wxTaskBarIcon::_OnMouseMove)