/////////////////////////////////////////////////////////////////////////////
// Name: icon.h
// Purpose: wxIcon class
-// Author: AUTHOR
+// Author: David Webster
// Modified by:
-// Created: ??/??/98
+// Created: 10/09/99
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c) David Webster
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_ICON_H_
#define _WX_ICON_H_
-#ifdef __GNUG__
-#pragma interface "icon.h"
-#endif
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
#include "wx/bitmap.h"
+#include "wx/os2/gdiimage.h"
-class WXDLLEXPORT wxIconRefData: public wxBitmapRefData
-{
- friend class WXDLLEXPORT wxBitmap;
- friend class WXDLLEXPORT wxIcon;
-public:
- wxIconRefData();
- ~wxIconRefData();
-
-public:
-/* TODO: whatever your actual icon handle is
- WXHICON m_hIcon;
-*/
-};
-
-#define M_ICONDATA ((wxIconRefData *)m_refData)
-#define M_ICONHANDLERDATA ((wxIconRefData *)bitmap->GetRefData())
+#define wxIconRefDataBase wxGDIImageRefData
+#define wxIconBase wxGDIImage
-// Icon
-class WXDLLEXPORT wxIcon: public wxBitmap
+class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
{
- DECLARE_DYNAMIC_CLASS(wxIcon)
-
public:
- wxIcon();
-
- // Copy constructors
- inline wxIcon(const wxIcon& icon) { Ref(icon); }
-
- wxIcon(const char bits[], int width, int height);
- wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
- int desiredWidth = -1, int desiredHeight = -1);
- wxIcon( char **bits, int width=-1, int height=-1 );
-
- ~wxIcon();
+ wxIconRefData() { };
+ virtual ~wxIconRefData() { Free(); }
- bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
- int desiredWidth = -1, int desiredHeight = -1);
+ virtual void Free();
+}; // end of
- inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
- inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
- inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
-
-/* TODO: implementation
- void SetHICON(WXHICON ico);
- inline WXHICON GetHICON() const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); }
-*/
-
-/* TODO */
- virtual bool Ok() const { return (m_refData != NULL) ; }
-private:
- // supress VisAge hiding warning
- bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE)
- { return(wxBitmap::LoadFile(name, type)); }
-};
-
-/* Example handlers. TODO: write your own handlers for relevant types.
-
-class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler
-{
- DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
-public:
- inline wxICOFileHandler()
- {
- m_name = "ICO icon file";
- m_extension = "ico";
- m_type = wxBITMAP_TYPE_ICO;
- };
-
- virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth = -1, int desiredHeight = -1);
-};
+// ---------------------------------------------------------------------------
+// Icon
+// ---------------------------------------------------------------------------
-class WXDLLEXPORT wxICOResourceHandler: public wxBitmapHandler
+class WXDLLEXPORT wxIcon: public wxIconBase
{
- DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
public:
- inline wxICOResourceHandler()
- {
- m_name = "ICO resource";
- m_extension = "ico";
- m_type = wxBITMAP_TYPE_ICO_RESOURCE;
- };
+ wxIcon();
+
+ // Copy constructors
+ inline wxIcon(const wxIcon& icon) { Ref(icon); }
+
+ wxIcon( const char bits[]
+ ,int nWidth
+ ,int nHeight
+ );
+ inline wxIcon(const char** ppData) { CreateIconFromXpm(ppData); }
+ inline wxIcon(char** ppData) { CreateIconFromXpm((const char**)ppData); }
+ wxIcon( const wxString& rName
+ ,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE
+ ,int nDesiredWidth = -1
+ ,int nDesiredHeight = -1
+ );
+ wxIcon(const wxIconLocation& loc)
+ {
+ LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICO);
+ }
+
+ ~wxIcon();
+
+ bool LoadFile( const wxString& rName
+ ,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE
+ ,int nDesiredWidth = -1
+ ,int nDesiredHeight = -1
+ );
+
+ inline wxIcon& operator = (const wxIcon& rIcon)
+ { if (*this != rIcon) Ref(rIcon); return *this; }
+ inline bool operator == (const wxIcon& rIcon) const
+ { return m_refData == rIcon.m_refData; }
+ inline bool operator != (const wxIcon& rIcon) const
+ { return m_refData != rIcon.m_refData; }
+
+ wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
+
+ inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
+ inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
+ inline bool IsXpm(void) const { return m_bIsXpm; };
+ inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; }
+
+ void CopyFromBitmap(const wxBitmap& rBmp);
+protected:
+ virtual wxGDIImageRefData* CreateData() const
+ {
+ return new wxIconRefData;
+ }
+ void CreateIconFromXpm(const char **ppData);
- virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth = -1, int desiredHeight = -1);
+private:
+ bool m_bIsXpm;
+ wxBitmap m_vXpmSrc;
+ DECLARE_DYNAMIC_CLASS(wxIcon)
};
-*/
-
#endif
// _WX_ICON_H_