Prefer to use standard selection colour in wxDataViewCustomRenderer.

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index a8355e703a056a588813a8e77b15a8bc57a3a0be..5b4c3d6b13b256d332b224cb16c236ecb58d4979 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:


@@ -27,13 +27,12 @@
 #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"
 
 #if wxUSE_WXDIB
 #include "wx/msw/gdiimage.h"
 
 #if wxUSE_WXDIB


@@ -62,17 +61,17 @@ WX_DEFINE_LIST(wxGDIImageHandlerList)
 class WXDLLEXPORT wxBMPFileHandler : public wxBitmapHandler
 {
 public:
 class WXDLLEXPORT wxBMPFileHandler : public wxBitmapHandler
 {
 public:

-    wxBMPFileHandler() : wxBitmapHandler(_T("Windows bitmap file"), _T("bmp"),
+    wxBMPFileHandler() : wxBitmapHandler(wxT("Windows bitmap file"), wxT("bmp"),

                                          wxBITMAP_TYPE_BMP)
     {
     }
 
     virtual bool LoadFile(wxBitmap *bitmap,
                                          wxBITMAP_TYPE_BMP)
     {
     }
 
     virtual bool LoadFile(wxBitmap *bitmap,

-                          const wxString& name, long flags,
+                          const wxString& name, wxBitmapType flags,

                           int desiredWidth, int desiredHeight);
                           int desiredWidth, int desiredHeight);

-    virtual bool SaveFile(wxBitmap *bitmap,
-                          const wxString& name, int type,
-                          const wxPalette *palette = NULL);
+    virtual bool SaveFile(const wxBitmap *bitmap,
+                          const wxString& name, wxBitmapType type,
+                          const wxPalette *palette = NULL) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)


@@ -81,14 +80,14 @@ private:
 class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
 {
 public:
 class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
 {
 public:

-    wxBMPResourceHandler() : wxBitmapHandler(_T("Windows bitmap resource"),
+    wxBMPResourceHandler() : wxBitmapHandler(wxT("Windows bitmap resource"),

                                              wxEmptyString,
                                              wxBITMAP_TYPE_BMP_RESOURCE)
     {
     }
 
     virtual bool LoadFile(wxBitmap *bitmap,
                                              wxEmptyString,
                                              wxBITMAP_TYPE_BMP_RESOURCE)
     {
     }
 
     virtual bool LoadFile(wxBitmap *bitmap,

-                          const wxString& name, long flags,
+                          const wxString& name, wxBitmapType flags,

                           int desiredWidth, int desiredHeight);
 
 private:
                           int desiredWidth, int desiredHeight);
 
 private:


@@ -98,15 +97,15 @@ private:
 class WXDLLEXPORT wxIconHandler : public wxGDIImageHandler
 {
 public:
 class WXDLLEXPORT wxIconHandler : public wxGDIImageHandler
 {
 public:

-    wxIconHandler(const wxString& name, const wxString& ext, long type)
+    wxIconHandler(const wxString& name, const wxString& ext, wxBitmapType type)

         : wxGDIImageHandler(name, ext, type)
     {
     }
 
     // creating and saving icons is not supported
     virtual bool Create(wxGDIImage *WXUNUSED(image),
         : wxGDIImageHandler(name, ext, type)
     {
     }
 
     // creating and saving icons is not supported
     virtual bool Create(wxGDIImage *WXUNUSED(image),

-                        void *WXUNUSED(data),
-                        long WXUNUSED(flags),
+                        const void* WXUNUSED(data),
+                        wxBitmapType WXUNUSED(flags),

                         int WXUNUSED(width),
                         int WXUNUSED(height),
                         int WXUNUSED(depth) = 1)
                         int WXUNUSED(width),
                         int WXUNUSED(height),
                         int WXUNUSED(depth) = 1)


@@ -114,42 +113,42 @@ public:
         return false;
     }
 
         return false;
     }
 

-    virtual bool Save(wxGDIImage *WXUNUSED(image),
+    virtual bool Save(const wxGDIImage *WXUNUSED(image),

                       const wxString& WXUNUSED(name),
                       const wxString& WXUNUSED(name),

-                      int WXUNUSED(type))
+                      wxBitmapType WXUNUSED(type)) const

     {
         return false;
     }
 
     virtual bool Load(wxGDIImage *image,
                       const wxString& name,
     {
         return false;
     }
 
     virtual bool Load(wxGDIImage *image,
                       const wxString& name,

-                      long flags,
+                      wxBitmapType flags,

                       int desiredWidth, int desiredHeight)
     {
         wxIcon *icon = wxDynamicCast(image, wxIcon);
                       int desiredWidth, int desiredHeight)
     {
         wxIcon *icon = wxDynamicCast(image, wxIcon);

-        wxCHECK_MSG( icon, false, _T("wxIconHandler only works with icons") );
+        wxCHECK_MSG( icon, false, wxT("wxIconHandler only works with icons") );

 
         return LoadIcon(icon, name, flags, desiredWidth, desiredHeight);
     }
 
 protected:
     virtual bool LoadIcon(wxIcon *icon,
 
         return LoadIcon(icon, name, flags, desiredWidth, desiredHeight);
     }
 
 protected:
     virtual bool LoadIcon(wxIcon *icon,

-                          const wxString& name, long flags,
+                          const wxString& name, wxBitmapType flags,

                           int desiredWidth = -1, int desiredHeight = -1) = 0;
 };
 
 class WXDLLEXPORT wxICOFileHandler : public wxIconHandler
 {
 public:
                           int desiredWidth = -1, int desiredHeight = -1) = 0;
 };
 
 class WXDLLEXPORT wxICOFileHandler : public wxIconHandler
 {
 public:

-    wxICOFileHandler() : wxIconHandler(_T("ICO icon file"),
-                                       _T("ico"),
+    wxICOFileHandler() : wxIconHandler(wxT("ICO icon file"),
+                                       wxT("ico"),

                                        wxBITMAP_TYPE_ICO)
     {
     }
 
 protected:
     virtual bool LoadIcon(wxIcon *icon,
                                        wxBITMAP_TYPE_ICO)
     {
     }
 
 protected:
     virtual bool LoadIcon(wxIcon *icon,

-                          const wxString& name, long flags,
+                          const wxString& name, wxBitmapType flags,

                           int desiredWidth = -1, int desiredHeight = -1);
 
 private:
                           int desiredWidth = -1, int desiredHeight = -1);
 
 private:


@@ -159,15 +158,15 @@ private:
 class WXDLLEXPORT wxICOResourceHandler: public wxIconHandler
 {
 public:
 class WXDLLEXPORT wxICOResourceHandler: public wxIconHandler
 {
 public:

-    wxICOResourceHandler() : wxIconHandler(_T("ICO resource"),
-                                           _T("ico"),
+    wxICOResourceHandler() : wxIconHandler(wxT("ICO resource"),
+                                           wxT("ico"),

                                            wxBITMAP_TYPE_ICO_RESOURCE)
     {
     }
 
 protected:
     virtual bool LoadIcon(wxIcon *icon,
                                            wxBITMAP_TYPE_ICO_RESOURCE)
     {
     }
 
 protected:
     virtual bool LoadIcon(wxIcon *icon,

-                          const wxString& name, long flags,
+                          const wxString& name, wxBitmapType flags,

                           int desiredWidth = -1, int desiredHeight = -1);
 
 private:
                           int desiredWidth = -1, int desiredHeight = -1);
 
 private:


@@ -319,12 +318,12 @@ void wxGDIImage::InitStandardHandlers()
 // ----------------------------------------------------------------------------
 
 bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
 // ----------------------------------------------------------------------------
 
 bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,

-                                    const wxString& name, long WXUNUSED(flags),
+                                    const wxString& name, wxBitmapType WXUNUSED(flags),

                                     int WXUNUSED(desiredWidth),
                                     int WXUNUSED(desiredHeight))
 {
     // TODO: load colourmap.
                                     int WXUNUSED(desiredWidth),
                                     int WXUNUSED(desiredHeight))
 {
     // TODO: load colourmap.

-    bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name));
+    bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name.wx_str()));

 
     if ( !bitmap->Ok() )
     {
 
     if ( !bitmap->Ok() )
     {


@@ -352,12 +351,12 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
 }
 
 bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
 }
 
 bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,

-                                const wxString& name, long WXUNUSED(flags),
+                                const wxString& name, wxBitmapType WXUNUSED(flags),

                                 int WXUNUSED(desiredWidth),
                                 int WXUNUSED(desiredHeight))
 {
 #if wxUSE_WXDIB
                                 int WXUNUSED(desiredWidth),
                                 int WXUNUSED(desiredHeight))
 {
 #if wxUSE_WXDIB

-    wxCHECK_MSG( bitmap, false, _T("NULL bitmap in LoadFile") );
+    wxCHECK_MSG( bitmap, false, wxT("NULL bitmap in LoadFile") );

 
     wxDIB dib(name);
 
 
     wxDIB dib(name);
 


@@ -367,13 +366,13 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
 #endif
 }
 
 #endif
 }
 

-bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
+bool wxBMPFileHandler::SaveFile(const wxBitmap *bitmap,

                                 const wxString& name,
                                 const wxString& name,

-                                int WXUNUSED(type),
-                                const wxPalette * WXUNUSED(pal))
+                                wxBitmapType WXUNUSED(type),
+                                const wxPalette * WXUNUSED(pal)) const

 {
 #if wxUSE_WXDIB
 {
 #if wxUSE_WXDIB

-    wxCHECK_MSG( bitmap, false, _T("NULL bitmap in SaveFile") );
+    wxCHECK_MSG( bitmap, false, wxT("NULL bitmap in SaveFile") );

 
     wxDIB dib(*bitmap);
 
 
     wxDIB dib(*bitmap);
 


@@ -389,7 +388,7 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
 
 bool wxICOFileHandler::LoadIcon(wxIcon *icon,
                                 const wxString& name,
 
 bool wxICOFileHandler::LoadIcon(wxIcon *icon,
                                 const wxString& name,

-                                long WXUNUSED(flags),
+                                wxBitmapType WXUNUSED(flags),

                                 int desiredWidth, int desiredHeight)
 {
     icon->UnRef();
                                 int desiredWidth, int desiredHeight)
 {
     icon->UnRef();


@@ -439,12 +438,12 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {
         // get the specified large icon from file
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {
         // get the specified large icon from file

-        if ( !::ExtractIconEx(nameReal, iconIndex, &hicon, NULL, 1) )
+        if ( !::ExtractIconEx(nameReal.wx_str(), iconIndex, &hicon, NULL, 1) )

         {
             // it is not an error, but it might still be useful to be informed
             // about it optionally
         {
             // it is not an error, but it might still be useful to be informed
             // about it optionally

-            wxLogTrace(_T("iconload"),
-                       _T("No large icons found in the file '%s'."),
+            wxLogTrace(wxT("iconload"),
+                       wxT("No large icons found in the file '%s'."),

                        name.c_str());
         }
     }
                        name.c_str());
         }
     }


@@ -452,10 +451,10 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
               desiredHeight == ::GetSystemMetrics(SM_CYSMICON) )
     {
         // get the specified small icon from file
               desiredHeight == ::GetSystemMetrics(SM_CYSMICON) )
     {
         // get the specified small icon from file

-        if ( !::ExtractIconEx(nameReal, iconIndex, NULL, &hicon, 1) )
+        if ( !::ExtractIconEx(nameReal.wx_str(), iconIndex, NULL, &hicon, 1) )

         {
         {

-            wxLogTrace(_T("iconload"),
-                       _T("No small icons found in the file '%s'."),
+            wxLogTrace(wxT("iconload"),
+                       wxT("No small icons found in the file '%s'."),

                        name.c_str());
         }
     }
                        name.c_str());
         }
     }


@@ -465,13 +464,13 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     if ( !hicon )
     {
         // take any size icon from the file by index
     if ( !hicon )
     {
         // take any size icon from the file by index

-        hicon = ::ExtractIcon(wxGetInstance(), nameReal, iconIndex);
+        hicon = ::ExtractIcon(wxGetInstance(), nameReal.wx_str(), iconIndex);

     }
 #endif
 
     if ( !hicon )
     {
     }
 #endif
 
     if ( !hicon )
     {

-        wxLogSysError(_T("Failed to load icon from the file '%s'"),
+        wxLogSysError(wxT("Failed to load icon from the file '%s'"),

                       name.c_str());
 
         return false;
                       name.c_str());
 
         return false;


@@ -482,8 +481,8 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     if ( (desiredWidth != -1 && desiredWidth != size.x) ||
          (desiredHeight != -1 && desiredHeight != size.y) )
     {
     if ( (desiredWidth != -1 && desiredWidth != size.x) ||
          (desiredHeight != -1 && desiredHeight != size.y) )
     {

-        wxLogTrace(_T("iconload"),
-                   _T("Returning false from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"),
+        wxLogTrace(wxT("iconload"),
+                   wxT("Returning false from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"),

                    size.x, size.y,
                    desiredWidth, desiredHeight);
 
                    size.x, size.y,
                    desiredWidth, desiredHeight);
 


@@ -500,7 +499,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
                                     const wxString& name,
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
                                     const wxString& name,

-                                    long WXUNUSED(flags),
+                                    wxBitmapType WXUNUSED(flags),

                                     int desiredWidth, int desiredHeight)
 {
     HICON hicon;
                                     int desiredWidth, int desiredHeight)
 {
     HICON hicon;


@@ -509,7 +508,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
     bool hasSize = desiredWidth != -1 || desiredHeight != -1;
 
     wxASSERT_MSG( !hasSize || (desiredWidth != -1 && desiredHeight != -1),
     bool hasSize = desiredWidth != -1 || desiredHeight != -1;
 
     wxASSERT_MSG( !hasSize || (desiredWidth != -1 && desiredHeight != -1),

-                  _T("width and height should be either both -1 or not") );
+                  wxT("width and height should be either both -1 or not") );

 
     // try to load the icon from this program first to allow overriding the
     // standard icons (although why one would want to do it considering that
 
     // try to load the icon from this program first to allow overriding the
     // standard icons (although why one would want to do it considering that


@@ -519,13 +518,13 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
     // some icon rescaling internally which results in very ugly 16x16 icons
     if ( hasSize )
     {
     // some icon rescaling internally which results in very ugly 16x16 icons
     if ( hasSize )
     {

-        hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON,
+        hicon = (HICON)::LoadImage(wxGetInstance(), name.wx_str(), IMAGE_ICON,

                                     desiredWidth, desiredHeight,
                                     LR_DEFAULTCOLOR);
     }
     else
     {
                                     desiredWidth, desiredHeight,
                                     LR_DEFAULTCOLOR);
     }
     else
     {

-        hicon = ::LoadIcon(wxGetInstance(), name);
+        hicon = ::LoadIcon(wxGetInstance(), name.wx_str());

     }
 
     // next check if it's not a standard icon
     }
 
     // next check if it's not a standard icon


@@ -549,6 +548,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
             if ( name == stdIcons[nIcon].name )
             {
                 hicon = ::LoadIcon((HINSTANCE)NULL, stdIcons[nIcon].id);
             if ( name == stdIcons[nIcon].name )
             {
                 hicon = ::LoadIcon((HINSTANCE)NULL, stdIcons[nIcon].id);

+                break;

             }
         }
     }
             }
         }
     }


@@ -568,12 +568,10 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 
 wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon))
 {
 
 wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon))
 {

-    // default icon size on this hardware
-    // usually 32x32 but can be other (smaller) on pocket devices
-    wxSize size(::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON));
+    wxSize size;

 
 #ifndef __WXWINCE__
 
 #ifndef __WXWINCE__

-    if ( hicon && wxGetOsVersion() != wxWIN32S )
+    if ( hicon )

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


@@ -597,10 +595,16 @@ wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon))
                 ::DeleteObject(info.hbmColor);
         }
     }
                 ::DeleteObject(info.hbmColor);
         }
     }

-#endif
+
+    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__

-