Fix compilo under MINGW32

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 7d04d9be55c817ce801395ab9b4325a596298d5c..1675b52c601adf8be03e1046d0e8a47b9bbcd518 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxGDIImage implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxGDIImage implementation
 // Author:      Vadim Zeitlin
 // Modified by:


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

-#ifdef __GNUG__
-    #pragma implementation "gdiimage.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"
 


@@ -31,18 +27,27 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/app.h"
+    #include "wx/bitmap.h"

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

-#include "wx/app.h"
-
-#include "wx/bitmap.h"

 #include "wx/msw/gdiimage.h"
 #include "wx/msw/gdiimage.h"

+
+#if wxUSE_WXDIB

 #include "wx/msw/dib.h"
 #include "wx/msw/dib.h"

+#endif
+
+#ifdef __WXWINCE__
+#include <winreg.h>
+#include <shellapi.h>
+#endif
+
+#include "wx/file.h"

 
 #include "wx/listimpl.cpp"
 
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxGDIImageHandlerList);
+WX_DEFINE_LIST(wxGDIImageHandlerList)

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -141,6 +146,7 @@ public:
     {
     }
 
     {
     }
 

+protected:

     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);


@@ -158,6 +164,7 @@ public:
     {
     }
 
     {
     }
 

+protected:

     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);


@@ -236,7 +243,7 @@ bool wxGDIImage::RemoveHandler(const wxString& name)
 
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 {
 
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 {

-    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();

     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();


@@ -251,11 +258,11 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
                                            long type)
 {
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
                                            long type)
 {

-    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();

     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();

-        if ( (handler->GetExtension() = extension) &&
+        if ( (handler->GetExtension() == extension) &&

              (type == -1 || handler->GetType() == type) )
         {
             return handler;
              (type == -1 || handler->GetType() == type) )
         {
             return handler;


@@ -268,7 +275,7 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
 
 wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 {
 
 wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 {

-    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();

     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();


@@ -283,13 +290,13 @@ wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 
 void wxGDIImage::CleanUpHandlers()
 {
 
 void wxGDIImage::CleanUpHandlers()
 {

-    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();

     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();

-        wxGDIImageHandlerList::Node *next = node->GetNext();
+        wxGDIImageHandlerList::compatibility_iterator next = node->GetNext();

         delete handler;
         delete handler;

-        delete node;
+        ms_handlers.Erase( node );

         node = next;
     }
 }
         node = next;
     }
 }


@@ -337,6 +344,9 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
     bitmap->SetHeight(bm.bmHeight);
     bitmap->SetDepth(bm.bmBitsPixel);
 
     bitmap->SetHeight(bm.bmHeight);
     bitmap->SetDepth(bm.bmBitsPixel);
 

+    // use 0xc0c0c0 as transparent colour by default
+    bitmap->SetMask(new wxMask(*bitmap, *wxLIGHT_GREY));
+

     return true;
 }
 
     return true;
 }
 


@@ -345,11 +355,15 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
                                 int WXUNUSED(desiredWidth),
                                 int WXUNUSED(desiredHeight))
 {
                                 int WXUNUSED(desiredWidth),
                                 int WXUNUSED(desiredHeight))
 {

+#if wxUSE_WXDIB

     wxCHECK_MSG( bitmap, false, _T("NULL bitmap in LoadFile") );
 
     wxDIB dib(name);
 
     return dib.IsOk() && bitmap->CopyFromDIB(dib);
     wxCHECK_MSG( bitmap, false, _T("NULL bitmap in LoadFile") );
 
     wxDIB dib(name);
 
     return dib.IsOk() && bitmap->CopyFromDIB(dib);

+#else
+    return false;
+#endif

 }
 
 bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
 }
 
 bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,


@@ -357,11 +371,15 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
                                 int WXUNUSED(type),
                                 const wxPalette * WXUNUSED(pal))
 {
                                 int WXUNUSED(type),
                                 const wxPalette * WXUNUSED(pal))
 {

+#if wxUSE_WXDIB

     wxCHECK_MSG( bitmap, false, _T("NULL bitmap in SaveFile") );
 
     wxDIB dib(*bitmap);
 
     return dib.Save(name);
     wxCHECK_MSG( bitmap, false, _T("NULL bitmap in SaveFile") );
 
     wxDIB dib(*bitmap);
 
     return dib.Save(name);

+#else
+    return false;
+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -373,14 +391,6 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
                                 long WXUNUSED(flags),
                                 int desiredWidth, int desiredHeight)
 {
                                 long WXUNUSED(flags),
                                 int desiredWidth, int desiredHeight)
 {

-#ifdef __DIGITALMARS__
-//FIXME __DIGITALMARS__ April 2003 CE
-    // why no ExtractIcon in library
-            wxLogTrace(_T("iconload"),
-                   _T("Returning false from wxICOFileHandler::Load because of DigitalMars compiler bug"));
-
-    return false;
-#else

     icon->UnRef();
 
     // actual size
     icon->UnRef();
 
     // actual size


@@ -423,7 +433,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     }
     else
 #endif
     }
     else
 #endif

-    // were we asked for a large icon?
+        // were we asked for a large icon?

     if ( desiredWidth == ::GetSystemMetrics(SM_CXICON) &&
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {
     if ( desiredWidth == ::GetSystemMetrics(SM_CXICON) &&
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {


@@ -450,11 +460,13 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     }
     //else: not standard size, load below
 
     }
     //else: not standard size, load below
 

+#ifndef __WXWINCE__

     if ( !hicon )
     {
         // take any size icon from the file by index
         hicon = ::ExtractIcon(wxGetInstance(), nameReal, iconIndex);
     }
     if ( !hicon )
     {
         // take any size icon from the file by index
         hicon = ::ExtractIcon(wxGetInstance(), nameReal, iconIndex);
     }

+#endif

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


@@ -483,7 +495,6 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     icon->SetSize(size.x, size.y);
 
     return icon->Ok();
     icon->SetSize(size.x, size.y);
 
     return icon->Ok();

-#endif // Digitalmars

 }
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 }
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,


@@ -517,6 +528,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
     }
 
     // next check if it's not a standard icon
     }
 
     // next check if it's not a standard icon

+#ifndef __WXWINCE__

     if ( !hicon && !hasSize )
     {
         static const struct
     if ( !hicon && !hasSize )
     {
         static const struct


@@ -539,6 +551,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
             }
         }
     }
             }
         }
     }

+#endif

 
     wxSize size = wxGetHiconSize(hicon);
     icon->SetSize(size.x, size.y);
 
     wxSize size = wxGetHiconSize(hicon);
     icon->SetSize(size.x, size.y);


@@ -552,11 +565,12 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

-wxSize wxGetHiconSize(HICON hicon)
+wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon))

 {
 {

-    wxSize size(32, 32);    // default
+    wxSize size;

 
 

-    if ( hicon && wxGetOsVersion() != wxWIN32S )
+#ifndef __WXWINCE__
+    if ( hicon )

     {
         ICONINFO info;
         if ( !::GetIconInfo(hicon, &info) )
     {
         ICONINFO info;
         if ( !::GetIconInfo(hicon, &info) )


@@ -581,8 +595,15 @@ wxSize wxGetHiconSize(HICON hicon)
         }
     }
 
         }
     }
 

+    if ( !size.x )
+#endif // !__WXWINCE__
+    {
+        // use default icon size on this hardware
+        size.x = ::GetSystemMetrics(SM_CXICON);
+        size.y = ::GetSystemMetrics(SM_CYICON);
+    }
+

     return size;
 }
 
 #endif // __WXMICROWIN__
     return size;
 }
 
 #endif // __WXMICROWIN__

-