projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
recreate the window if FSAA is requested (changeset_r54022_Fix.patch from #9145)
[wxWidgets.git]
/
src
/
motif
/
icon.cpp
diff --git
a/src/motif/icon.cpp
b/src/motif/icon.cpp
index 55d70fdd9af63070d1236cd6f7da51110649cd3b..eaa688689b8dbcb82cb9890dcea37786561f3f1d 100644
(file)
--- a/
src/motif/icon.cpp
+++ b/
src/motif/icon.cpp
@@
-1,33
+1,24
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// 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"
-#include "wx/window.h"
-
-#include <Xm/Xm.h>
-#include <X11/cursorfont.h>
-
-#include "wx/motif/private.h"
-#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-#endif
-/
*
-
*
Icons
-*/
+/
/ ============================================================================
+
//
Icons
+// ============================================================================
wxIcon::wxIcon()
{
wxIcon::wxIcon()
{
@@
-39,35
+30,39
@@
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* const* data)
+{
+ (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+}
-wxIcon::wxIcon(const wxString& icon_file, long flags,
- int desiredWidth, int desiredHeight)
-
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
{
{
- LoadFile(icon_file, flags, desiredWidth, desiredHeight);
+ wxIcon *icon = (wxIcon*)(&bmp);
+ *this = *icon;
}
wxIcon::~wxIcon()
{
}
}
wxIcon::~wxIcon()
{
}
-bool wxIcon::LoadFile(const wxString& filename,
long
type,
+bool wxIcon::LoadFile(const wxString& filename,
wxBitmapType
type,
int desiredWidth, int desiredHeight)
{
UnRef();
int desiredWidth, int desiredHeight)
{
UnRef();
-
- m_refData = new wxBitmapRefData;
-
+
wxBitmapHandler *handler = FindHandler(type);
wxBitmapHandler *handler = FindHandler(type);
-
+
if ( handler )
if ( handler )
- return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
+ return handler->LoadFile(this, filename, type,
+ desiredWidth, desiredHeight);
else
else
- return
FALSE
;
+ return
false
;
}
}
-