projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing infinite recursion for rotated text, introduced in cleanup r57915
[wxWidgets.git]
/
src
/
motif
/
icon.cpp
diff --git
a/src/motif/icon.cpp
b/src/motif/icon.cpp
index e8316d4b9d7722c226a2386af3cf75d2749dce2b..eaa688689b8dbcb82cb9890dcea37786561f3f1d 100644
(file)
--- a/
src/motif/icon.cpp
+++ b/
src/motif/icon.cpp
@@
-1,21
+1,20
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: icon.cpp
+// Name:
src/motif/
icon.cpp
// Purpose: wxIcon class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Purpose: wxIcon class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "icon.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/icon.h"
#include "wx/icon.h"
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
;
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
// ============================================================================
// Icons
// ============================================================================
// Icons
@@
-31,13
+30,15
@@
wxIcon::wxIcon(const char bits[], int width, int height)
(void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, 1);
}
(void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, 1);
}
+#ifdef wxNEEDS_CHARPP
// Create from XPM data
wxIcon::wxIcon(char **data)
{
(void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
}
// Create from XPM data
wxIcon::wxIcon(char **data)
{
(void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
}
+#endif
-wxIcon::wxIcon(const char
**
data)
+wxIcon::wxIcon(const char
* const*
data)
{
(void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
}
{
(void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
}
@@
-58,10
+59,10
@@
bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
UnRef();
wxBitmapHandler *handler = FindHandler(type);
UnRef();
wxBitmapHandler *handler = FindHandler(type);
-
+
if ( handler )
return handler->LoadFile(this, filename, type,
desiredWidth, desiredHeight);
else
if ( handler )
return handler->LoadFile(this, filename, type,
desiredWidth, desiredHeight);
else
- return
FALSE
;
+ return
false
;
}
}