projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
show the function in which the assert failure occured if the compiler supports it
[wxWidgets.git]
/
include
/
wx
/
mgl
/
icon.h
diff --git
a/include/wx/mgl/icon.h
b/include/wx/mgl/icon.h
index 40ed949c92db55c3e235f454c6a484b9b99decc7..03d1c437a106ae683f5cd7902bd4c4effe601aa2 100644
(file)
--- a/
include/wx/mgl/icon.h
+++ b/
include/wx/mgl/icon.h
@@
-7,14
+7,9
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
#ifndef __WX_ICON_H__
#define __WX_ICON_H__
#ifndef __WX_ICON_H__
#define __WX_ICON_H__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "icon.h"
-#endif
-
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/bitmap.h"
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/bitmap.h"
@@
-33,7
+28,6
@@
class WXDLLEXPORT wxIcon: public wxBitmap
{
public:
wxIcon() : wxBitmap() {}
{
public:
wxIcon() : wxBitmap() {}
- wxIcon(const wxIcon& icon);
wxIcon(const char **bits, int width=-1, int height=-1);
wxIcon(char **bits, int width=-1, int height=-1);
wxIcon(const char **bits, int width=-1, int height=-1);
wxIcon(char **bits, int width=-1, int height=-1);
@@
-48,7
+42,6
@@
public:
{
}
{
}
- wxIcon& operator=(const wxIcon& icon);
bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
bool operator!=(const wxIcon& icon) const { return !(*this == icon); }
bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
bool operator!=(const wxIcon& icon) const { return !(*this == icon); }