Disable some wxWebView tests that fail on the buildbot but not locally.

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 1ca4dafb129be16e2bdb6d1973a025c95bedcfb8..fdd9d501c33f7fc132a04d2ec35a5a5afd7ce244 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/icon.cpp
+// Name:        src/msw/icon.cpp

 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // Modified by: 20.11.99 (VZ): don't derive from wxBitmap any more
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // 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

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


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "icon.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -29,27 +25,21 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/icon.h"
     #include "wx/list.h"
     #include "wx/utils.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
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARIES
-    IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)

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


@@ -63,7 +53,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;
     }


@@ -73,31 +65,77 @@ void wxIconRefData::Free()
 // wxIcon
 // ----------------------------------------------------------------------------
 
 // wxIcon
 // ----------------------------------------------------------------------------
 

-wxIcon::wxIcon()
-{
-}
-
-wxIcon::wxIcon(const char WXUNUSED(bits)[],
-               int WXUNUSED(width),
-               int WXUNUSED(height))
+wxIcon::wxIcon(const char bits[], int width, int height)

 {
 {

+    wxBitmap bmp(bits, width, height);
+    CopyFromBitmap(bmp);

 }
 
 wxIcon::wxIcon(const wxString& iconfile,
 }
 
 wxIcon::wxIcon(const wxString& iconfile,

-               long flags,
+               wxBitmapType type,

                int desiredWidth,
                int desiredHeight)
 
 {
                int desiredWidth,
                int desiredHeight)
 
 {

-    LoadFile(iconfile, flags, desiredWidth, desiredHeight);
+    LoadFile(iconfile, type, desiredWidth, desiredHeight);
+}
+
+wxIcon::wxIcon(const wxIconLocation& loc)
+{
+    // wxICOFileHandler accepts names in the format "filename;index"
+    wxString fullname = loc.GetFileName();
+    if ( loc.GetIndex() )
+    {
+        fullname << wxT(';') << loc.GetIndex();
+    }
+    //else: 0 is default
+
+    LoadFile(fullname, wxBITMAP_TYPE_ICO);

 }
 
 wxIcon::~wxIcon()
 {
 }
 
 }
 
 wxIcon::~wxIcon()
 {
 }
 

+wxObjectRefData *wxIcon::CloneRefData(const wxObjectRefData *dataOrig) const
+{
+    const wxIconRefData *
+        data = static_cast<const wxIconRefData *>(dataOrig);
+    if ( !data )
+        return NULL;
+
+    // we don't have to copy m_hIcon because we're only called from SetHICON()
+    // which overwrites m_hIcon anyhow currently
+    //
+    // and if we're called from SetWidth/Height/Depth(), it doesn't make sense
+    // to copy it neither as the handle would be inconsistent with the new size
+    return new wxIconRefData(*data);
+}
+
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+#ifndef __WXMICROWIN__
+    HICON hicon = wxBitmapToHICON(bmp);
+    if ( !hicon )
+    {
+        wxLogLastError(wxT("CreateIconIndirect"));
+    }
+    else
+    {
+        SetHICON((WXHICON)hicon);
+        SetSize(bmp.GetWidth(), bmp.GetHeight());
+    }
+#endif // __WXMICROWIN__
+}
+
+void wxIcon::CreateIconFromXpm(const char* const* data)
+{
+    wxBitmap bmp(data);
+    CopyFromBitmap(bmp);
+}
+

 bool wxIcon::LoadFile(const wxString& filename,
 bool wxIcon::LoadFile(const wxString& filename,

-                      long type,
+                      wxBitmapType type,

                       int desiredWidth, int desiredHeight)
 {
     UnRef();
                       int desiredWidth, int desiredHeight)
 {
     UnRef();


@@ -106,10 +144,15 @@ bool wxIcon::LoadFile(const wxString& filename,
 
     if ( !handler )
     {
 
     if ( !handler )
     {

-        // say something?
-        return FALSE;
+        // load via wxBitmap which, in turn, uses wxImage allowing us to
+        // support more formats
+        wxBitmap bmp;
+        if ( !bmp.LoadFile(filename, type) )
+            return false;
+
+        CopyFromBitmap(bmp);
+        return true;

     }
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);
 }
     }
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);
 }

-