From: Václav Slavík <vslavik@fastmail.fm>
Date: Fri, 4 Apr 2003 22:47:58 +0000 (+0000)
Subject: preparation for X11 wxTaskBarIcon version:
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f5b1bb5e76fee489c42d9525d91867fff8620f9c?ds=sidebyside
preparation for X11 wxTaskBarIcon version:
1. moved events to common file from MSW specific
2. deprecated virtual functions in favour of event handlers
3. removed taskbar.cpp files from port that don't implement it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 5851716c1f..8a4d97d2ad 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -548,7 +548,6 @@ statbrma.cpp Mac
statlmac.cpp Mac
stattext.cpp Mac
tabctrl.cpp Mac
-taskbar.cpp Mac
textctrl.cpp Mac
thread.cpp Mac
timer.cpp Mac
@@ -765,7 +764,6 @@ statbox.cpp OS2
statline.cpp OS2
stattext.cpp OS2
tabctrl.cpp OS2
-taskbar.cpp OS2
textctrl.cpp OS2
timer.cpp OS2
thread.cpp OS2
@@ -1177,7 +1175,6 @@ statline.h MacH
stattext.h MacH
statusbr.h MacH
tabctrl.h MacH
-taskbar.h MacH
textctrl.h MacH
timer.h MacH
toolbar.h MacH
@@ -1486,7 +1483,6 @@ dc.h OS2H
tabctrl.h OS2H
dcclient.h OS2H
print.h OS2H
-taskbar.h OS2H
bmpbuttn.h OS2H
dcmemory.h OS2H
iniconf.h OS2H
diff --git a/include/wx/mac/taskbar.h b/include/wx/mac/taskbar.h
deleted file mode 100644
index 27b38b6b73..0000000000
--- a/include/wx/mac/taskbar.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/////////////////////////////////////////////////////////////////////////
-// File: taskbar.h
-// Purpose: Defines wxTaskBarIcon class for manipulating icons on the
-// task bar. Optional.
-// Author: Stefan Csomor
-// Modified by:
-// Created: 1998-01-01
-// RCS-ID: $Id$
-// Copyright: (c)
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TASKBAR_H_
-#define _WX_TASKBAR_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "taskbar.h"
-#endif
-
-#include "wx/list.h"
-#include "wx/icon.h"
-
-class wxTaskBarIcon: public wxObject
-{
-public:
- wxTaskBarIcon();
- virtual ~wxTaskBarIcon();
-
-// Accessors
-
-// Operations
- bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
- bool RemoveIcon();
-
-// Overridables
- virtual void OnMouseMove();
- virtual void OnLButtonDown();
- virtual void OnLButtonUp();
- virtual void OnRButtonDown();
- virtual void OnRButtonUp();
- virtual void OnLButtonDClick();
- virtual void OnRButtonDClick();
-
-// Data members
-protected:
-};
-
-#endif
- // _WX_TASKBAR_H_
diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst
index f917dccb73..d22a0f2c04 100644
--- a/src/mac/carbon/files.lst
+++ b/src/mac/carbon/files.lst
@@ -238,7 +238,6 @@ ALL_SOURCES = \
mac/statlmac.cpp \
mac/stattext.cpp \
mac/tabctrl.cpp \
- mac/taskbar.cpp \
mac/textctrl.cpp \
mac/thread.cpp \
mac/timer.cpp \
@@ -584,7 +583,6 @@ ALL_HEADERS = \
mac/stattext.h \
mac/statusbr.h \
mac/tabctrl.h \
- mac/taskbar.h \
mac/textctrl.h \
mac/timer.h \
mac/toolbar.h \
@@ -900,7 +898,6 @@ GUIOBJS = \
statlmac.o \
stattext.o \
tabctrl.o \
- taskbar.o \
textctrl.o \
thread.o \
timer.o \
diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp
deleted file mode 100644
index df0eb5a9b7..0000000000
--- a/src/mac/carbon/taskbar.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/////////////////////////////////////////////////////////////////////////
-// File: taskbar.cpp
-// Purpose: Implements wxTaskBarIcon class for manipulating icons on
-// the task bar. Optional.
-// Author: Stefan Csomor
-// Modified by:
-// Created: 1998-01-01
-// RCS-ID: $Id$
-// Copyright: (c)
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "taskbar.h"
-#endif
-
-#include "wx/taskbar.h"
-
-wxTaskBarIcon::wxTaskBarIcon()
-{
- // TODO
-}
-
-wxTaskBarIcon::~wxTaskBarIcon()
-{
- // TODO
-}
-
-// Operations
-bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
-{
- // TODO
- return FALSE;
-}
-
-bool wxTaskBarIcon::RemoveIcon()
-{
- // TODO
- return FALSE;
-}
-
-// Overridables
-void wxTaskBarIcon::OnMouseMove()
-{
-}
-
-void wxTaskBarIcon::OnLButtonDown()
-{
-}
-
-void wxTaskBarIcon::OnLButtonUp()
-{
-}
-
-void wxTaskBarIcon::OnRButtonDown()
-{
-}
-
-void wxTaskBarIcon::OnRButtonUp()
-{
-}
-
-void wxTaskBarIcon::OnLButtonDClick()
-{
-}
-
-void wxTaskBarIcon::OnRButtonDClick()
-{
-}
-
diff --git a/src/mac/files.lst b/src/mac/files.lst
index f917dccb73..d22a0f2c04 100644
--- a/src/mac/files.lst
+++ b/src/mac/files.lst
@@ -238,7 +238,6 @@ ALL_SOURCES = \
mac/statlmac.cpp \
mac/stattext.cpp \
mac/tabctrl.cpp \
- mac/taskbar.cpp \
mac/textctrl.cpp \
mac/thread.cpp \
mac/timer.cpp \
@@ -584,7 +583,6 @@ ALL_HEADERS = \
mac/stattext.h \
mac/statusbr.h \
mac/tabctrl.h \
- mac/taskbar.h \
mac/textctrl.h \
mac/timer.h \
mac/toolbar.h \
@@ -900,7 +898,6 @@ GUIOBJS = \
statlmac.o \
stattext.o \
tabctrl.o \
- taskbar.o \
textctrl.o \
thread.o \
timer.o \
diff --git a/src/mac/taskbar.cpp b/src/mac/taskbar.cpp
deleted file mode 100644
index df0eb5a9b7..0000000000
--- a/src/mac/taskbar.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/////////////////////////////////////////////////////////////////////////
-// File: taskbar.cpp
-// Purpose: Implements wxTaskBarIcon class for manipulating icons on
-// the task bar. Optional.
-// Author: Stefan Csomor
-// Modified by:
-// Created: 1998-01-01
-// RCS-ID: $Id$
-// Copyright: (c)
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "taskbar.h"
-#endif
-
-#include "wx/taskbar.h"
-
-wxTaskBarIcon::wxTaskBarIcon()
-{
- // TODO
-}
-
-wxTaskBarIcon::~wxTaskBarIcon()
-{
- // TODO
-}
-
-// Operations
-bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
-{
- // TODO
- return FALSE;
-}
-
-bool wxTaskBarIcon::RemoveIcon()
-{
- // TODO
- return FALSE;
-}
-
-// Overridables
-void wxTaskBarIcon::OnMouseMove()
-{
-}
-
-void wxTaskBarIcon::OnLButtonDown()
-{
-}
-
-void wxTaskBarIcon::OnLButtonUp()
-{
-}
-
-void wxTaskBarIcon::OnRButtonDown()
-{
-}
-
-void wxTaskBarIcon::OnRButtonUp()
-{
-}
-
-void wxTaskBarIcon::OnLButtonDClick()
-{
-}
-
-void wxTaskBarIcon::OnRButtonDClick()
-{
-}
-
diff --git a/src/os2/files.lst b/src/os2/files.lst
index 0721407ea3..f69f4447b7 100644
--- a/src/os2/files.lst
+++ b/src/os2/files.lst
@@ -234,7 +234,6 @@ ALL_SOURCES = \
os2/statline.cpp \
os2/stattext.cpp \
os2/tabctrl.cpp \
- os2/taskbar.cpp \
os2/textctrl.cpp \
os2/thread.cpp \
os2/timer.cpp \
@@ -567,7 +566,6 @@ ALL_HEADERS = \
os2/statline.h \
os2/stattext.h \
os2/tabctrl.h \
- os2/taskbar.h \
os2/textctrl.h \
os2/timer.h \
os2/toolbar.h \
@@ -872,7 +870,6 @@ GUIOBJS = \
statline.o \
stattext.o \
tabctrl.o \
- taskbar.o \
textctrl.o \
thread.o \
timer.o \