///////////////////////////////////////////////////////////////////////////////
-// Name: msw/gdiimage.cpp
+// Name: src/msw/gdiimage.cpp
// Purpose: wxGDIImage implementation
// Author: Vadim Zeitlin
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "gdiimage.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.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"
-#include "wx/app.h"
+#include "wx/msw/gdiimage.h"
-#ifndef __WXMICROWIN__
+#if wxUSE_WXDIB
#include "wx/msw/dib.h"
#endif
-#include "wx/msw/bitmap.h"
-#include "wx/msw/gdiimage.h"
-#include "wx/bitmap.h"
-
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxGDIImageHandlerList);
+#ifdef __WXWINCE__
+#include <winreg.h>
+#include <shellapi.h>
+#endif
+#include "wx/file.h"
-#ifdef __WIN16__
-# include "wx/msw/curico.h"
-#endif // __WIN16__
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxGDIImageHandlerList)
// ----------------------------------------------------------------------------
// private classes
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,
- const wxString& name, long flags,
+ const wxString& name, wxBitmapType flags,
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)
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,
- const wxString& name, long flags,
+ const wxString& name, wxBitmapType flags,
int desiredWidth, int desiredHeight);
private:
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),
- void *WXUNUSED(data),
- long WXUNUSED(flags),
+ const void* WXUNUSED(data),
+ wxBitmapType WXUNUSED(flags),
int WXUNUSED(width),
int WXUNUSED(height),
int WXUNUSED(depth) = 1)
return false;
}
- virtual bool Save(wxGDIImage *WXUNUSED(image),
+ virtual bool Save(const wxGDIImage *WXUNUSED(image),
const wxString& WXUNUSED(name),
- int WXUNUSED(type))
+ wxBitmapType WXUNUSED(type)) const
{
return false;
}
virtual bool Load(wxGDIImage *image,
const wxString& name,
- long flags,
+ wxBitmapType flags,
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,
- const wxString& name, long flags,
+ const wxString& name, wxBitmapType flags,
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,
- const wxString& name, long flags,
+ const wxString& name, wxBitmapType flags,
int desiredWidth = -1, int desiredHeight = -1);
private:
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,
- const wxString& name, long flags,
+ const wxString& name, wxBitmapType flags,
int desiredWidth = -1, int desiredHeight = -1);
private:
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();
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();
- if ( (handler->GetExtension() = extension) &&
+ if ( (handler->GetExtension() == extension) &&
(type == -1 || handler->GetType() == type) )
{
return handler;
wxGDIImageHandler *wxGDIImage::FindHandler(long type)
{
- wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+ wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();
while ( node )
{
wxGDIImageHandler *handler = node->GetData();
void wxGDIImage::CleanUpHandlers()
{
- wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+ wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();
while ( node )
{
wxGDIImageHandler *handler = node->GetData();
- wxGDIImageHandlerList::Node *next = node->GetNext();
+ wxGDIImageHandlerList::compatibility_iterator next = node->GetNext();
delete handler;
- delete node;
+ ms_handlers.Erase( node );
node = next;
}
}
// ----------------------------------------------------------------------------
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.
- bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name));
+ bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name.wx_str()));
- if ( !bitmap->Ok() )
+ if ( !bitmap->IsOk() )
{
// it's probably not found
wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."),
bitmap->SetHeight(bm.bmHeight);
bitmap->SetDepth(bm.bmBitsPixel);
+ // use 0xc0c0c0 as transparent colour by default
+ bitmap->SetMask(new wxMask(*bitmap, *wxLIGHT_GREY));
+
return true;
}
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_IMAGE_LOADING_IN_MSW
- wxPalette *palette = NULL;
- bool success = wxLoadIntoBitmap(WXSTRINGCAST name, bitmap, &palette) != 0;
-
-#if wxUSE_PALETTE
- if ( success && palette )
- {
- bitmap->SetPalette(*palette);
- }
+#if wxUSE_WXDIB
+ wxCHECK_MSG( bitmap, false, wxT("NULL bitmap in LoadFile") );
- // it was copied by the bitmap if it was loaded successfully
- delete palette;
-#endif // wxUSE_PALETTE
+ wxDIB dib(name);
- return success;
+ return dib.IsOk() && bitmap->CopyFromDIB(dib);
#else
return false;
#endif
}
-bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
+bool wxBMPFileHandler::SaveFile(const wxBitmap *bitmap,
const wxString& name,
- int WXUNUSED(type),
- const wxPalette *pal)
+ wxBitmapType WXUNUSED(type),
+ const wxPalette * WXUNUSED(pal)) const
{
-#if wxUSE_IMAGE_LOADING_IN_MSW
+#if wxUSE_WXDIB
+ wxCHECK_MSG( bitmap, false, wxT("NULL bitmap in SaveFile") );
-#if wxUSE_PALETTE
- wxPalette *actualPalette = (wxPalette *)pal;
- if ( !actualPalette )
- actualPalette = bitmap->GetPalette();
-#else
- wxPalette *actualPalette = NULL;
-#endif // wxUSE_PALETTE
+ wxDIB dib(*bitmap);
- return wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0;
+ return dib.Save(name);
#else
return false;
#endif
bool wxICOFileHandler::LoadIcon(wxIcon *icon,
const wxString& name,
- long WXUNUSED(flags),
+ wxBitmapType WXUNUSED(flags),
int desiredWidth, int desiredHeight)
{
-#if wxUSE_RESOURCE_LOADING_IN_MSW
icon->UnRef();
// actual size
wxSize size;
-#ifdef __WIN32__
HICON hicon = NULL;
// Parse the filename: it may be of the form "filename;n" in order to
}
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) )
{
// 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
- 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());
}
}
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());
}
}
//else: not standard size, load below
+#ifndef __WXWINCE__
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 )
{
- 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;
}
size = wxGetHiconSize(hicon);
-#else // Win16
- HICON hicon = ReadIconFile((wxChar *)name.c_str(),
- wxGetInstance(),
- &size.x, &size.y);
- HICON hIcon = 0;
- HANDLE hDIB = 0;
-
- // Read the icon DIB from file
- if( (hDIB = ReadIcon((wxChar *)name.c_str(), &size.x, &size.y)) == (HANDLE) NULL)
- return false;
-
- // Create an icon from DIB
- hicon = MakeIcon( hDIB, wxGetInstance());
- GlobalFree( hDIB);
-#endif // Win32/Win16
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);
icon->SetHICON((WXHICON)hicon);
icon->SetSize(size.x, size.y);
- return icon->Ok();
-#else
- return false;
-#endif
+ return icon->IsOk();
}
bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
const wxString& name,
- long WXUNUSED(flags),
+ wxBitmapType WXUNUSED(flags),
int desiredWidth, int desiredHeight)
{
HICON hicon;
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
// note that we can't just always call LoadImage() because it seems to do
// some icon rescaling internally which results in very ugly 16x16 icons
-#if defined(__WIN32__) && !defined(__SC__)
if ( hasSize )
{
- hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON,
+ hicon = (HICON)::LoadImage(wxGetInstance(), name.wx_str(), IMAGE_ICON,
desiredWidth, desiredHeight,
LR_DEFAULTCOLOR);
}
else
-#endif // Win32/!Win32
{
- hicon = ::LoadIcon(wxGetInstance(), name);
+ hicon = ::LoadIcon(wxGetInstance(), name.wx_str());
}
// next check if it's not a standard icon
+#ifndef __WXWINCE__
if ( !hicon && !hasSize )
{
static const struct
if ( name == stdIcons[nIcon].name )
{
hicon = ::LoadIcon((HINSTANCE)NULL, stdIcons[nIcon].id);
+ break;
}
}
}
+#endif
wxSize size = wxGetHiconSize(hicon);
icon->SetSize(size.x, size.y);
icon->SetHICON((WXHICON)hicon);
- return icon->Ok();
+ return icon->IsOk();
}
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
-wxSize wxGetHiconSize(HICON hicon)
+wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon))
{
- wxSize size(32, 32); // default
+ wxSize size;
-#ifdef __WIN32__
- // Win32s doesn't have GetIconInfo function...
- if ( hicon && wxGetOsVersion() != wxWIN32S )
+#ifndef __WXWINCE__
+ if ( hicon )
{
ICONINFO info;
if ( !::GetIconInfo(hicon, &info) )
::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__
+
+#endif // __WXMICROWIN__
projects / wxWidgets.git / blobdiff