Printing improvements: GetPageInfo() gets called after the DC has

[wxWidgets.git] / src / msw / icon.cpp

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 30edc93816afacb514a48342a274cc8baf3a7b34..6a7783ebf533d4d858fc30d005f2af39fea7c387 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -5,8 +5,8 @@
 // Modified by: 20.11.99 (VZ): don't derive from wxBitmap any more
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -35,20 +35,16 @@
     #include "wx/app.h"
     #include "wx/icon.h"
     #include "wx/bitmap.h"
     #include "wx/app.h"
     #include "wx/icon.h"
     #include "wx/bitmap.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/msw/private.h"
 
 #endif
 
 #include "wx/msw/private.h"
 

-#if wxUSE_RESOURCE_LOADING_IN_MSW
-    #include "wx/msw/curico.h"
-    #include "wx/msw/curicop.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -62,7 +58,9 @@ void wxIconRefData::Free()
 {
     if ( m_hIcon )
     {
 {
     if ( m_hIcon )
     {

+#ifndef __WXMICROWIN__

         ::DestroyIcon((HICON) m_hIcon);
         ::DestroyIcon((HICON) m_hIcon);

+#endif

 
         m_hIcon = 0;
     }
 
         m_hIcon = 0;
     }


@@ -87,63 +85,37 @@ wxIcon::wxIcon(const wxString& iconfile,
     LoadFile(iconfile, flags, desiredWidth, desiredHeight);
 }
 
     LoadFile(iconfile, flags, desiredWidth, desiredHeight);
 }
 

-wxIcon::~wxIcon()
-{
-}
-
-void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+wxIcon::wxIcon(const wxIconLocation& loc)

 {
 {

-#ifdef __WIN32__
-    wxMask *mask = bmp.GetMask();
-    if ( !mask )
+    // wxICOFileHandler accepts names in the format "filename;index"
+    wxString fullname = loc.GetFileName();
+    if ( loc.GetIndex() )

     {
     {

-        // we must have a mask for an icon, so even if it's probably incorrect,
-        // do create it (grey is the "standard" transparent colour)
-        mask = new wxMask(bmp, *wxLIGHT_GREY);
+        fullname << _T(';') << loc.GetIndex();

     }
     }

+    //else: 0 is default

 
 

-    ICONINFO iconInfo;
-    iconInfo.fIcon = TRUE;  // we want an icon, not a cursor
-    iconInfo.hbmMask = wxInvertMask((HBITMAP)mask->GetMaskBitmap());
-    iconInfo.hbmColor = GetHbitmapOf(bmp);
-
-    /* GRG: black out the transparent area to preserve background
-     * colour, because Windows blits the original bitmap using
-     * SRCINVERT (XOR) after applying the mask to the dest rect.
-     */
-    HDC dcSrc = ::CreateCompatibleDC(NULL);
-    HDC dcDst = ::CreateCompatibleDC(NULL);
-    SelectObject(dcSrc, (HBITMAP)mask->GetMaskBitmap());
-    SelectObject(dcDst, iconInfo.hbmColor);
-
-    BitBlt(dcDst, 0, 0, bmp.GetWidth(), bmp.GetHeight(), dcSrc, 0, 0, SRCAND);
+    LoadFile(fullname, wxBITMAP_TYPE_ICO);
+}

 
 

-    SelectObject(dcDst, NULL);
-    SelectObject(dcSrc, NULL);
-    DeleteDC(dcDst);
-    DeleteDC(dcSrc);
+wxIcon::~wxIcon()
+{
+}

 
 

-    HICON hicon = ::CreateIconIndirect(&iconInfo);
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+#ifndef __WXMICROWIN__
+    HICON hicon = wxBitmapToHICON(bmp);

     if ( !hicon )
     {
     if ( !hicon )
     {

-        wxLogLastError("CreateIconIndirect");
+        wxLogLastError(wxT("CreateIconIndirect"));

     }
     else
     {
         SetHICON((WXHICON)hicon);
         SetSize(bmp.GetWidth(), bmp.GetHeight());
     }
     }
     else
     {
         SetHICON((WXHICON)hicon);
         SetSize(bmp.GetWidth(), bmp.GetHeight());
     }

-
-    if ( !bmp.GetMask() )
-    {
-        // we created the mask, now delete it
-        delete mask;
-    }
-#else // Win16
-    // there are some functions in curico.cpp which probably could be used
-    // here...
-    wxFAIL_MSG("not implemented");
-#endif // Win32/16
+#endif // __WXMICROWIN__

 }
 
 void wxIcon::CreateIconFromXpm(const char **data)
 }
 
 void wxIcon::CreateIconFromXpm(const char **data)