Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxIcon more independent from wxBitmap implementation.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-04-02 20:48:57 +00:00
parent 70aac632a1
commit 59e034c034
3 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/motif/icon.cpp
View File

@@ -14,24 +14,12 @@
#endif
#include "wx/icon.h"
#include "wx/window.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <X11/cursorfont.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);
#include "wx/motif/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
/*
* Icons
*/
// ============================================================================
// Icons
// ============================================================================
wxIcon::wxIcon()
{
@@ -75,9 +63,7 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
int desiredWidth, int desiredHeight)
{
UnRef();
m_refData = new wxBitmapRefData;
wxBitmapHandler *handler = FindHandler(type);
if ( handler )
@@ -86,4 +72,3 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
else
return FALSE;
}