projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add virtual destructors to fix GCC4 warnings.
[wxWidgets.git]
/
include
/
wx
/
iconloc.h
diff --git
a/include/wx/iconloc.h
b/include/wx/iconloc.h
index 2ace40208b64a2650304f297a193c410a02b4398..dcccca3274f64ccbf1cc46ea1a9d41a45f838743 100644
(file)
--- a/
include/wx/iconloc.h
+++ b/
include/wx/iconloc.h
@@
-5,7
+5,7
@@
// Modified by:
// Created: 21.06.2003
// RCS-ID: $Id$
// Modified by:
// Created: 21.06.2003
// RCS-ID: $Id$
-// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwi
ndow
s.org>
+// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwi
dget
s.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@
-18,11
+18,12
@@
// wxIconLocation: describes the location of an icon
// ----------------------------------------------------------------------------
// wxIconLocation: describes the location of an icon
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxIconLocationBase
+class WXDLL
IMPEXP_BASE
wxIconLocationBase
{
public:
// ctor takes the name of the file where the icon is
{
public:
// ctor takes the name of the file where the icon is
- wxEXPLICIT wxIconLocationBase(const wxString& file) : m_filename(file) { }
+ wxEXPLICIT wxIconLocationBase(const wxString& filename = wxEmptyString)
+ : m_filename(filename) { }
// default copy ctor, assignment operator and dtor are ok
// default copy ctor, assignment operator and dtor are ok
@@
-31,7
+32,7
@@
public:
bool IsOk() const { return !m_filename.empty(); }
// set/get the icon file name
bool IsOk() const { return !m_filename.empty(); }
// set/get the icon file name
- void SetFileName(const wxString& file
) { m_filename = fil
e; }
+ void SetFileName(const wxString& file
name) { m_filename = filenam
e; }
const wxString& GetFileName() const { return m_filename; }
private:
const wxString& GetFileName() const { return m_filename; }
private:
@@
-42,12
+43,12
@@
private:
// index of the icon
#if defined(__WXMSW__)
// index of the icon
#if defined(__WXMSW__)
-class WXDLL
EXPORT
wxIconLocation : public wxIconLocationBase
+class WXDLL
IMPEXP_BASE
wxIconLocation : public wxIconLocationBase
{
public:
// ctor takes the name of the file where the icon is and the icons index in
// the file
{
public:
// ctor takes the name of the file where the icon is and the icons index in
// the file
- wxEXPLICIT wxIconLocation(const wxString& file, int num = 0);
+ wxEXPLICIT wxIconLocation(const wxString& file
= wxEmptyString
, int num = 0);
// set/get the icon index
void SetIndex(int num) { m_index = num; }
// set/get the icon index
void SetIndex(int num) { m_index = num; }
@@
-66,7
+67,13
@@
wxIconLocation::wxIconLocation(const wxString& file, int num)
#else // !MSW
#else // !MSW
-typedef wxIconLocationBase wxIconLocation;
+// must be a class because we forward declare it as class
+class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase
+{
+public:
+ wxEXPLICIT wxIconLocation(const wxString& filename = wxEmptyString)
+ : wxIconLocationBase(filename) { }
+};
#endif // platform
#endif // platform