projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only declare wxHandleFatalExceptions() when wxUSE_ON_FATAL_EXCEPTION == 1
[wxWidgets.git]
/
include
/
wx
/
os2
/
icon.h
diff --git
a/include/wx/os2/icon.h
b/include/wx/os2/icon.h
index b4ecbd07a106f0dddc894ec06f709edcf20d21a3..2f000c4aa4b08299050d44e09b1990868f579d2f 100644
(file)
--- a/
include/wx/os2/icon.h
+++ b/
include/wx/os2/icon.h
@@
-6,7
+6,7
@@
// Created: 10/09/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
// Created: 10/09/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_ICON_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_ICON_H_
@@
-16,23
+16,11
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-// compatible (even if incorrect) behaviour by default: derive wxIcon from
-// wxBitmap
-#ifndef wxICON_IS_BITMAP
- #define wxICON_IS_BITMAP 1
-#endif
-
#include "wx/bitmap.h"
#include "wx/bitmap.h"
-#i
f wxICON_IS_BITMAP
+#i
nclude "wx/os2/gdiimage.h"
- #define wxIconRefDataBase wxBitmapRefData
- #define wxIconBase wxBitmap
-#else
- #include "wx/os2/gdiimage.h"
-
- #define wxIconRefDataBase wxGDIImageRefData
- #define wxIconBase wxGDIImage
-#endif
+#define wxIconRefDataBase wxGDIImageRefData
+#define wxIconBase wxGDIImage
class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
{
class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
{