X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..5c5ab9ebc3a7dd441c9e3b25cb3daf8f733c374f:/src/msw/icon.cpp?ds=sidebyside

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index f5daa68de4..00b0741ab7 100644
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -1,192 +1,113 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        icon.cpp
+// Name:        msw/icon.cpp
 // Purpose:     wxIcon class
 // Author:      Julian Smart
-// Modified by:
+// Modified by: 20.11.99 (VZ): don't derive from wxBitmap any more
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
-#pragma implementation "icon.h"
+    #pragma implementation "icon.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/icon.h"
+    #include "wx/defs.h"
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/msw/private.h"
-#include "assert.h"
 
-#if USE_XPM_IN_MSW
-#define FOR_MSW 1
-#include "..\..\contrib\wxxpm\libxpm.34b\lib\xpm34.h"
+#if wxUSE_RESOURCE_LOADING_IN_MSW
+    #include "wx/msw/curico.h"
+    #include "wx/msw/curicop.h"
 #endif
 
-#if USE_RESOURCE_LOADING_IN_MSW
-#include "wx/msw/curico.h"
-#include "wx/msw/curicop.h"
-#endif
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxBitmapHandler)
-#endif
+    IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
 
-/*
- * Icons
- */
+// ============================================================================
+// implementation
+// ============================================================================
 
+// ----------------------------------------------------------------------------
+// wxIconRefData
+// ----------------------------------------------------------------------------
 
-wxIconRefData::wxIconRefData(void)
+void wxIconRefData::Free()
 {
-  m_hIcon = (WXHICON) NULL ;
-}
+    if ( m_hIcon )
+    {
+        ::DestroyIcon((HICON) m_hIcon);
 
-wxIconRefData::~wxIconRefData(void)
-{
-	if ( m_hIcon )
-		::DestroyIcon((HICON) m_hIcon);
+        m_hIcon = 0;
+    }
 }
 
-wxIcon::wxIcon(void)
-{
-}
+// ----------------------------------------------------------------------------
+// wxIcon
+// ----------------------------------------------------------------------------
 
-wxIcon::wxIcon(const char WXUNUSED(bits)[], const int WXUNUSED(width), const int WXUNUSED(height))
+wxIcon::wxIcon()
 {
 }
 
-wxIcon::wxIcon(const wxString& icon_file, const long flags,
-    int desiredWidth, int desiredHeight)
-
+wxIcon::wxIcon(const char WXUNUSED(bits)[],
+               int WXUNUSED(width),
+               int WXUNUSED(height))
 {
-  LoadFile(icon_file, flags, desiredWidth, desiredHeight);
 }
 
-wxIcon::~wxIcon(void)
-{
-}
+wxIcon::wxIcon(const wxString& iconfile,
+               long flags,
+               int desiredWidth,
+               int desiredHeight)
 
-bool wxIcon::FreeResource(bool force)
 {
-  if (M_ICONDATA && M_ICONDATA->m_hIcon)
-  {
-    DestroyIcon((HICON) M_ICONDATA->m_hIcon);
-	M_ICONDATA->m_hIcon = (WXHICON) NULL;
-  }
-  return TRUE;
+    LoadFile(iconfile, flags, desiredWidth, desiredHeight);
 }
 
-bool wxIcon::LoadFile(const wxString& filename, const long type,
-    int desiredWidth, int desiredHeight)
+wxIcon::~wxIcon()
 {
-  UnRef();
-
-  m_refData = new wxIconRefData;
-
-  wxBitmapHandler *handler = FindHandler(type);
-
-  if ( handler )
-	return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
-  else
-	return FALSE;
 }
 
-void wxIcon::SetHICON(WXHICON ico)
+bool wxIcon::LoadFile(const wxString& filename,
+                      long type,
+                      int desiredWidth, int desiredHeight)
 {
-  if ( !M_ICONDATA )
-	m_refData = new wxIconRefData;
+    UnRef();
 
-  M_ICONDATA->m_hIcon = ico;
-}
+    wxGDIImageHandler *handler = FindHandler(type);
 
-bool wxICOFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
-    int desiredWidth, int desiredHeight)
-{
-#if USE_RESOURCE_LOADING_IN_MSW
-	if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) )
-	{
-		wxIcon *icon = (wxIcon *)bitmap;
-        int width, height;
-        WXHICON hIcon = (WXHICON) ReadIconFile((char *)(const char *)name, wxGetInstance(), &width, &height);
-
-    	((wxIconRefData *)icon->GetRefData())->m_hIcon = hIcon;
-    	((wxIconRefData *)icon->GetRefData())->m_ok = (((wxIconRefData *)icon->GetRefData())->m_hIcon != 0);
-    	return ((wxIconRefData *)icon->GetRefData())->m_ok;
-	}
-	else
-		return FALSE;
-#else
-	return FALSE;
-#endif
-}
-
-bool wxICOResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
-    int desiredWidth, int desiredHeight)
-{
-	if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) )
-	{
-#if defined(__WIN32__)
-    if (desiredWidth > -1 && desiredHeight > -1)
-    {
-        M_ICONHANDLERDATA->m_hIcon = (WXHICON) ::LoadImage(wxGetInstance(), name, IMAGE_ICON, desiredWidth, desiredHeight, LR_DEFAULTCOLOR);
-    }
-    else
-#endif
+    if ( !handler )
     {
-    	M_ICONHANDLERDATA->m_hIcon = (WXHICON) ::LoadIcon(wxGetInstance(), name);
+        // say something?
+        return FALSE;
     }
 
-#ifdef __WIN32__
-/***
-    	DWORD vers = GetVersion() ;
-    	WORD  high = HIWORD(vers) ; // high bit=0 for NT, 1 for Win32s
-    	// Win32s doesn't have GetIconInfo function...
-    	if (M_ICONHANDLERDATA->m_hIcon && (high&0x8000)==0 )
-***/
-    	if (M_ICONHANDLERDATA->m_hIcon && wxGetOsVersion()==wxWINDOWS_NT)
-    	{
-      		ICONINFO info ;
-      		if (::GetIconInfo((HICON) M_ICONHANDLERDATA->m_hIcon, &info))
-      		{
-        		HBITMAP ms_bitmap = info.hbmMask ;
-        		if (ms_bitmap)
-        		{
-          			BITMAP bm;
-          			::GetObject(ms_bitmap, sizeof(BITMAP), (LPSTR) &bm);
-          			M_ICONHANDLERDATA->m_width = bm.bmWidth;
-          			M_ICONHANDLERDATA->m_height = bm.bmHeight;
-        		}
-        		if (info.hbmMask)
-          			::DeleteObject(info.hbmMask) ;
-        		if (info.hbmColor)
-          			::DeleteObject(info.hbmColor) ;
-      		}
-    	}
-#else
-    	M_ICONHANDLERDATA->m_width = 32;
-    	M_ICONHANDLERDATA->m_height = 32;
-#endif
-    	M_ICONHANDLERDATA->m_ok = (M_ICONHANDLERDATA->m_hIcon != 0);
-    	return M_ICONHANDLERDATA->m_ok;
-	}
-	else
-	    return FALSE;
+    return handler->Load(this, filename, type, desiredWidth, desiredHeight);
 }