class wxImageRefData: public wxObjectRefData
{
-
public:
wxImageRefData();
~wxImageRefData();
wxImageRefData::~wxImageRefData()
{
- if (m_data) free( m_data );
+ if (m_data)
+ free( m_data );
}
wxList wxImage::sm_handlers;
#define M_IMGDATA ((wxImageRefData *)m_refData)
-#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
-#endif
wxImage::wxImage()
{
{
wxImage image;
- wxCHECK_MSG( Ok(), image, _T("invalid image") );
+ wxCHECK_MSG( Ok(), image, wxT("invalid image") );
- wxCHECK_MSG( (width > 0) && (height > 0), image, _T("invalid image size") );
+ wxCHECK_MSG( (width > 0) && (height > 0), image, wxT("invalid image size") );
image.Create( width, height );
char unsigned *data = image.GetData();
- wxCHECK_MSG( data, image, _T("unable to create image") );
+ wxCHECK_MSG( data, image, wxT("unable to create image") );
if (M_IMGDATA->m_hasMask)
image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
{
wxImage image;
- wxCHECK_MSG( Ok(), image, _T("invalid image") );
+ wxCHECK_MSG( Ok(), image, wxT("invalid image") );
- wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight())
- , image, _T("invalid subimage size") );
+ wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()),
+ image, wxT("invalid subimage size") );
int subwidth=rect.GetWidth();
const int subheight=rect.GetHeight();
char unsigned *subdata = image.GetData(), *data=GetData();
- wxCHECK_MSG( subdata, image, _T("unable to create image") );
+ wxCHECK_MSG( subdata, image, wxT("unable to create image") );
if (M_IMGDATA->m_hasMask)
image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
const int subleft=3*rect.GetLeft();
const int width=3*GetWidth();
subwidth*=3;
-
+
data+=rect.GetTop()*width+subleft;
for (long j = 0; j < subheight; ++j)
{
memcpy( subdata, data, subwidth);
subdata+=subwidth;
- data+=width;
+ data+=width;
}
return image;
}
+void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
+ unsigned char r2, unsigned char g2, unsigned char b2 )
+{
+ wxCHECK_RET( Ok(), wxT("invalid image") );
+
+ char unsigned *data = GetData();
+
+ const int w = GetWidth();
+ const int h = GetHeight();
+
+ for (int j = 0; j < h; j++)
+ for (int i = 0; i < w; i++)
+ {
+ if ((data[0] == r1) && (data[1] == g1) && (data[2] == b1))
+ {
+ data[0] = r2;
+ data[1] = g2;
+ data[2] = b2;
+ }
+ data += 3;
+ }
+}
+
void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )
{
- wxCHECK_RET( Ok(), _T("invalid image") );
+ wxCHECK_RET( Ok(), wxT("invalid image") );
int w = M_IMGDATA->m_width;
int h = M_IMGDATA->m_height;
- wxCHECK_RET( (x>=0) && (y>=0) && (x<w) && (y<h), _T("invalid image index") );
+ wxCHECK_RET( (x>=0) && (y>=0) && (x<w) && (y<h), wxT("invalid image index") );
long pos = (y * w + x) * 3;
unsigned char wxImage::GetRed( int x, int y )
{
- wxCHECK_MSG( Ok(), 0, _T("invalid image") );
+ wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
int w = M_IMGDATA->m_width;
int h = M_IMGDATA->m_height;
- wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, _T("invalid image index") );
+ wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, wxT("invalid image index") );
long pos = (y * w + x) * 3;
unsigned char wxImage::GetGreen( int x, int y )
{
- wxCHECK_MSG( Ok(), 0, _T("invalid image") );
+ wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
int w = M_IMGDATA->m_width;
int h = M_IMGDATA->m_height;
- wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, _T("invalid image index") );
+ wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, wxT("invalid image index") );
long pos = (y * w + x) * 3;
unsigned char wxImage::GetBlue( int x, int y )
{
- wxCHECK_MSG( Ok(), 0, _T("invalid image") );
+ wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
int w = M_IMGDATA->m_width;
int h = M_IMGDATA->m_height;
- wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, _T("invalid image index") );
+ wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, wxT("invalid image index") );
long pos = (y * w + x) * 3;
char unsigned *wxImage::GetData() const
{
- wxCHECK_MSG( Ok(), (char unsigned *)NULL, _T("invalid image") );
+ wxCHECK_MSG( Ok(), (char unsigned *)NULL, wxT("invalid image") );
return M_IMGDATA->m_data;
}
void wxImage::SetData( char unsigned *data )
{
- wxCHECK_RET( Ok(), _T("invalid image") );
+ wxCHECK_RET( Ok(), wxT("invalid image") );
wxImageRefData *newRefData = new wxImageRefData();
newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
newRefData->m_hasMask = M_IMGDATA->m_hasMask;
-
+
UnRef();
-
+
m_refData = newRefData;
}
void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
{
- wxCHECK_RET( Ok(), _T("invalid image") );
+ wxCHECK_RET( Ok(), wxT("invalid image") );
M_IMGDATA->m_maskRed = r;
M_IMGDATA->m_maskGreen = g;
unsigned char wxImage::GetMaskRed() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid image") );
+ wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
return M_IMGDATA->m_maskRed;
}
unsigned char wxImage::GetMaskGreen() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid image") );
+ wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
return M_IMGDATA->m_maskGreen;
}
unsigned char wxImage::GetMaskBlue() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid image") );
+ wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
return M_IMGDATA->m_maskBlue;
}
void wxImage::SetMask( bool mask )
{
- wxCHECK_RET( Ok(), _T("invalid image") );
+ wxCHECK_RET( Ok(), wxT("invalid image") );
M_IMGDATA->m_hasMask = mask;
}
bool wxImage::HasMask() const
{
- wxCHECK_MSG( Ok(), FALSE, _T("invalid image") );
+ wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
return M_IMGDATA->m_hasMask;
}
int wxImage::GetWidth() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid image") );
+ wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
return M_IMGDATA->m_width;
}
int wxImage::GetHeight() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid image") );
+ wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
return M_IMGDATA->m_height;
}
if (wxFileExists(filename))
{
wxFileInputStream stream(filename);
- return LoadFile(stream, type);
+ wxBufferedInputStream bstream( stream );
+ return LoadFile(bstream, type);
}
-
- else {
- wxLogError( _T("Can't load image from file '%s': file does not exist."), filename.c_str() );
+ else
+ {
+ wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
return FALSE;
}
if (wxFileExists(filename))
{
wxFileInputStream stream(filename);
- return LoadFile(stream, mimetype);
+ wxBufferedInputStream bstream( stream );
+ return LoadFile(bstream, mimetype);
}
-
- else {
- wxLogError( _T("Can't load image from file '%s': file does not exist."), filename.c_str() );
+ else
+ {
+ wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
return FALSE;
}
wxFileOutputStream stream(filename);
if ( stream.LastError() == wxStream_NOERROR )
- return SaveFile(stream, type);
+ {
+ wxBufferedOutputStream bstream( stream );
+ return SaveFile(bstream, type);
+ }
else
#endif // wxUSE_STREAMS
return FALSE;
wxFileOutputStream stream(filename);
if ( stream.LastError() == wxStream_NOERROR )
- return SaveFile(stream, mimetype);
+ {
+ wxBufferedOutputStream bstream( stream );
+ return SaveFile(bstream, mimetype);
+ }
else
#endif // wxUSE_STREAMS
return FALSE;
}
+bool wxImage::CanRead( const wxString &name )
+{
+#if wxUSE_STREAMS
+ wxFileInputStream stream(name);
+ return CanRead(stream);
+#else
+ return FALSE;
+#endif
+}
+
#if wxUSE_STREAMS
+bool wxImage::CanRead( wxInputStream &stream )
+{
+ wxList &list=GetHandlers();
+
+ for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
+ {
+ wxImageHandler *handler=(wxImageHandler*)node->GetData();
+ if (handler->CanRead( stream ))
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
bool wxImage::LoadFile( wxInputStream& stream, long type )
{
UnRef();
if (type==wxBITMAP_TYPE_ANY)
{
- wxList &list=GetHandlers();
+ wxList &list=GetHandlers();
- for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
- {
- handler=(wxImageHandler*)node->GetData();
- if (handler->CanRead( stream ))
- return handler->LoadFile( this, stream );
+ for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
+ {
+ handler=(wxImageHandler*)node->GetData();
+ if (handler->CanRead( stream ))
+ return handler->LoadFile( this, stream );
- }
+ }
- wxLogWarning( _T("No handler found for this image.") );
- return FALSE;
+ wxLogWarning( _("No handler found for image type.") );
+ return FALSE;
}
handler = FindHandler(type);
if (handler == NULL)
{
- wxLogWarning( _T("No image handler for type %d defined."), type );
+ wxLogWarning( _("No image handler for type %d defined."), type );
return FALSE;
}
if (handler == NULL)
{
- wxLogWarning( _T("No image handler for type %s defined."), mimetype.GetData() );
+ wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
return FALSE;
}
bool wxImage::SaveFile( wxOutputStream& stream, int type )
{
- wxCHECK_MSG( Ok(), FALSE, _T("invalid image") );
+ wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
wxImageHandler *handler = FindHandler(type);
if (handler == NULL)
{
- wxLogWarning( _T("No image handler for type %d defined."), type );
+ wxLogWarning( _("No image handler for type %d defined."), type );
return FALSE;
}
bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype )
{
- wxCHECK_MSG( Ok(), FALSE, _T("invalid image") );
+ wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
wxImageHandler *handler = FindHandlerMime(mimetype);
if (handler == NULL)
{
- wxLogWarning( _T("No image handler for type %s defined."), mimetype.GetData() );
+ wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
return FALSE;
}
// wxImageHandler
//-----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxImageHandler,wxObject)
-#endif
+IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)
#if wxUSE_STREAMS
-bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
+bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) )
{
return FALSE;
}
return FALSE;
}
-bool wxImageHandler::CanRead( wxInputStream& stream )
+int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )
{
- return FALSE;
+ return 1;
}
bool wxImageHandler::CanRead( const wxString& name )
{
-#if wxUSE_STREAMS
if (wxFileExists(name))
{
wxFileInputStream stream(name);
}
else {
- wxLogError( _T("Can't check image format of file '%s': file does not exist."), name.c_str() );
+ wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );
return FALSE;
}
-#else // !wxUSE_STREAMS
- return FALSE;
-#endif // wxUSE_STREAMS
+// return FALSE;
}
-
-
#endif // wxUSE_STREAMS
//-----------------------------------------------------------------------------
// set bitmap parameters
wxBitmap bitmap;
- wxCHECK_MSG( Ok(), bitmap, _T("invalid image") );
+ wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
bitmap.SetWidth( width );
bitmap.SetHeight( bmpHeight );
bitmap.SetDepth( wxDisplayDepth() );
// create a DIB header
int headersize = sizeof(BITMAPINFOHEADER);
- LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
- wxCHECK_MSG( lpDIBh, bitmap, _T("could not allocate memory for DIB header") );
+ BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );
+ wxCHECK_MSG( lpDIBh, bitmap, wxT("could not allocate memory for DIB header") );
// Fill in the DIB header
lpDIBh->bmiHeader.biSize = headersize;
lpDIBh->bmiHeader.biWidth = (DWORD)width;
lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage );
if( !lpBits )
{
- wxFAIL_MSG( _T("could not allocate memory for DIB") );
+ wxFAIL_MSG( wxT("could not allocate memory for DIB") );
free( lpDIBh );
return bitmap;
}
// HDC memdc = ::CreateCompatibleDC( hdc );
// ::SelectObject( memdc, hbitmap);
// ::SetDIBitsToDevice( memdc, 0, 0, width, height,
- // 0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS);
+ // 0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS);
// ::SelectObject( memdc, 0 );
// ::DeleteDC( memdc );
}
free(lpDIBh);
free(lpBits);
+#if WXWIN_COMPATIBILITY_2
// check the wxBitmap object
- if( bitmap.GetHBITMAP() )
- bitmap.SetOk( TRUE );
- else
- bitmap.SetOk( FALSE );
+ bitmap.GetBitmapData()->SetOk();
+#endif // WXWIN_COMPATIBILITY_2
return bitmap;
}
// check the bitmap
if( !bitmap.Ok() )
{
- wxFAIL_MSG( _T("invalid bitmap") );
+ wxFAIL_MSG( wxT("invalid bitmap") );
return;
}
unsigned char *data = GetData();
if( !data )
{
- wxFAIL_MSG( _T("could not allocate data for image") );
+ wxFAIL_MSG( wxT("could not allocate data for image") );
return;
}
// create a DIB header
int headersize = sizeof(BITMAPINFOHEADER);
- LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
+ BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );
if( !lpDIBh )
{
- wxFAIL_MSG( _T("could not allocate data for DIB header") );
+ wxFAIL_MSG( wxT("could not allocate data for DIB header") );
free( data );
return;
}
lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
if( !lpBits )
{
- wxFAIL_MSG( _T("could not allocate data for DIB") );
+ wxFAIL_MSG( wxT("could not allocate data for DIB") );
free( data );
free( lpDIBh );
return;
#endif
+#ifdef __WXMAC__
+
+#include <PictUtils.h>
+
+extern CTabHandle wxMacCreateColorTable( int numColors ) ;
+extern void wxMacDestroyColorTable( CTabHandle colors ) ;
+extern void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green , int blue ) ;
+extern GWorldPtr wxMacCreateGWorld( int height , int width , int depth ) ;
+extern void wxMacDestroyGWorld( GWorldPtr gw ) ;
+
+wxBitmap wxImage::ConvertToBitmap() const
+{
+ // width and height of the device-dependent bitmap
+ int width = GetWidth();
+ int height = GetHeight();
+
+ // Create picture
+
+ wxBitmap bitmap( width , height , wxDisplayDepth() ) ;
+
+ // Create mask
+
+ if (HasMask())
+ {
+ /*
+ unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+
+ mask_image = gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height );
+
+ wxMask *mask = new wxMask();
+ mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 );
+
+ bitmap.SetMask( mask );
+ */
+ }
+
+ // Render
+
+ int r_mask = GetMaskRed();
+ int g_mask = GetMaskGreen();
+ int b_mask = GetMaskBlue();
+
+ CGrafPtr origPort ;
+ GDHandle origDevice ;
+
+ GetGWorld( &origPort , &origDevice ) ;
+ SetGWorld( bitmap.GetHBITMAP() , NULL ) ;
+
+ register unsigned char* data = GetData();
+
+ int index = 0;
+ for (int y = 0; y < height; y++)
+ {
+#if 0
+ unsigned char lastr = 0 ;
+ unsigned char lastg = 0 ;
+ unsigned char lastb = 0 ;
+ RGBColor lastcolor ;
+
+ MoveTo( 0 , y ) ;
+ for (int x = 0; x < width; x++)
+ {
+ unsigned char r = data[index++];
+ unsigned char g = data[index++];
+ unsigned char b = data[index++];
+
+ if ( r != lastr || g != lastg || b != lastb )
+ {
+ lastcolor.red = ( lastr << 8 ) + lastr ;
+ lastcolor.green = ( lastg << 8 ) + lastg ;
+ lastcolor.blue = ( lastb << 8 ) + lastb ;
+ RGBForeColor( &lastcolor ) ;
+ LineTo( x , y ) ;
+ lastr = r ;
+ lastg = g ;
+ lastb = b ;
+ }
+ } // for width
+ lastcolor.red = ( lastr << 8 ) + lastr ;
+ lastcolor.green = ( lastg << 8 ) + lastg ;
+ lastcolor.blue = ( lastb << 8 ) + lastb ;
+ RGBForeColor( &lastcolor ) ;
+ LineTo( width - 1 , y ) ;
+#else
+ for (int x = 0; x < width; x++)
+ {
+ unsigned char r = data[index++];
+ unsigned char g = data[index++];
+ unsigned char b = data[index++];
+ RGBColor color ;
+ color.red = ( r << 8 ) + r ;
+ color.green = ( g << 8 ) + g ;
+ color.blue = ( b << 8 ) + b ;
+ SetCPixel( x , y , &color ) ;
+ }
+#endif
+ } // for height
+
+ SetGWorld( origPort , origDevice ) ;
+
+ return bitmap;
+
+}
+
+wxImage::wxImage( const wxBitmap &bitmap )
+{
+ // check the bitmap
+ if( !bitmap.Ok() )
+ {
+ wxFAIL_MSG( "invalid bitmap" );
+ return;
+ }
+
+ // create an wxImage object
+ int width = bitmap.GetWidth();
+ int height = bitmap.GetHeight();
+ Create( width, height );
+ /*
+ unsigned char *data = GetData();
+ if( !data )
+ {
+ wxFAIL_MSG( "could not allocate data for image" );
+ return;
+ }
+
+ // calc the number of bytes per scanline and padding in the DIB
+ int bytePerLine = width*3;
+ int sizeDWORD = sizeof( DWORD );
+ div_t lineBoundary = div( bytePerLine, sizeDWORD );
+ int padding = 0;
+ if( lineBoundary.rem > 0 )
+ {
+ padding = sizeDWORD - lineBoundary.rem;
+ bytePerLine += padding;
+ }
+
+ // create a DIB header
+ int headersize = sizeof(BITMAPINFOHEADER);
+ LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
+ if( !lpDIBh )
+ {
+ wxFAIL_MSG( "could not allocate data for DIB header" );
+ free( data );
+ return;
+ }
+ // Fill in the DIB header
+ lpDIBh->bmiHeader.biSize = headersize;
+ lpDIBh->bmiHeader.biWidth = width;
+ lpDIBh->bmiHeader.biHeight = -height;
+ lpDIBh->bmiHeader.biSizeImage = bytePerLine * height;
+ lpDIBh->bmiHeader.biPlanes = 1;
+ lpDIBh->bmiHeader.biBitCount = 24;
+ lpDIBh->bmiHeader.biCompression = BI_RGB;
+ lpDIBh->bmiHeader.biClrUsed = 0;
+ // These seem not really needed for our purpose here.
+ lpDIBh->bmiHeader.biClrImportant = 0;
+ lpDIBh->bmiHeader.biXPelsPerMeter = 0;
+ lpDIBh->bmiHeader.biYPelsPerMeter = 0;
+ // memory for DIB data
+ unsigned char *lpBits;
+ lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
+ if( !lpBits )
+ {
+ wxFAIL_MSG( "could not allocate data for DIB" );
+ free( data );
+ free( lpDIBh );
+ return;
+ }
+
+ // copy data from the device-dependent bitmap to the DIB
+ HDC hdc = ::GetDC(NULL);
+ HBITMAP hbitmap;
+ hbitmap = (HBITMAP) bitmap.GetHBITMAP();
+ ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
+
+ // copy DIB data into the wxImage object
+ int i, j;
+ unsigned char *ptdata = data;
+ unsigned char *ptbits = lpBits;
+ for( i=0; i<height; i++ )
+ {
+ for( j=0; j<width; j++ )
+ {
+ *(ptdata++) = *(ptbits+2);
+ *(ptdata++) = *(ptbits+1);
+ *(ptdata++) = *(ptbits );
+ ptbits += 3;
+ }
+ ptbits += padding;
+ }
+
+ // similarly, set data according to the possible mask bitmap
+ if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
+ {
+ hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap();
+ // memory DC created, color set, data copied, and memory DC deleted
+ HDC memdc = ::CreateCompatibleDC( hdc );
+ ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
+ ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
+ ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
+ ::DeleteDC( memdc );
+ // background color set to RGB(16,16,16) in consistent with wxGTK
+ unsigned char r=16, g=16, b=16;
+ ptdata = data;
+ ptbits = lpBits;
+ for( i=0; i<height; i++ )
+ {
+ for( j=0; j<width; j++ )
+ {
+ if( *ptbits != 0 )
+ ptdata += 3;
+ else
+ {
+ *(ptdata++) = r;
+ *(ptdata++) = g;
+ *(ptdata++) = b;
+ }
+ ptbits += 3;
+ }
+ ptbits += padding;
+ }
+ SetMaskColour( r, g, b );
+ SetMask( TRUE );
+ }
+ else
+ {
+ SetMask( FALSE );
+ }
+ // free allocated resources
+ ::ReleaseDC(NULL, hdc);
+ free(lpDIBh);
+ free(lpBits);
+ */
+}
+
+#endif
+
//-----------------------------------------------------------------------------
// GTK conversion routines
//-----------------------------------------------------------------------------
#ifdef __WXGTK__
-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
-#include "gdk/gdkx.h"
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
#if (GTK_MINOR_VERSION > 0)
-#include "gdk/gdkrgb.h"
+#include <gdk/gdkrgb.h>
#endif
wxBitmap wxImage::ConvertToBitmap() const
{
wxBitmap bitmap;
- wxCHECK_MSG( Ok(), bitmap, _T("invalid image") );
+ wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
int width = GetWidth();
int height = GetHeight();
{
static bool s_hasInitialized = FALSE;
- if (!s_hasInitialized)
- {
- gdk_rgb_init();
- s_hasInitialized = TRUE;
- }
+ if (!s_hasInitialized)
+ {
+ gdk_rgb_init();
+ s_hasInitialized = TRUE;
+ }
GdkGC *gc = gdk_gc_new( bitmap.GetPixmap() );
- gdk_draw_rgb_image( bitmap.GetPixmap(),
- gc,
- 0, 0,
- width, height,
- GDK_RGB_DITHER_NONE,
- GetData(),
- width*3 );
+ gdk_draw_rgb_image( bitmap.GetPixmap(),
+ gc,
+ 0, 0,
+ width, height,
+ GDK_RGB_DITHER_NONE,
+ GetData(),
+ width*3 );
gdk_gc_unref( gc );
- return bitmap;
+ return bitmap;
}
#endif
wxImage::wxImage( const wxBitmap &bitmap )
{
- wxCHECK_RET( bitmap.Ok(), _T("invalid bitmap") );
+ wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") );
- GdkImage *gdk_image = gdk_image_get( bitmap.GetPixmap(),
- 0, 0,
- bitmap.GetWidth(), bitmap.GetHeight() );
+ GdkImage *gdk_image = (GdkImage*) NULL;
+ if (bitmap.GetPixmap())
+ {
+ gdk_image = gdk_image_get( bitmap.GetPixmap(),
+ 0, 0,
+ bitmap.GetWidth(), bitmap.GetHeight() );
+ } else
+ if (bitmap.GetBitmap())
+ {
+ gdk_image = gdk_image_get( bitmap.GetBitmap(),
+ 0, 0,
+ bitmap.GetWidth(), bitmap.GetHeight() );
+ } else
+ {
+ wxFAIL_MSG( wxT("Ill-formed bitmap") );
+ }
- wxCHECK_RET( gdk_image, _T("couldn't create image") );
+ wxCHECK_RET( gdk_image, wxT("couldn't create image") );
Create( bitmap.GetWidth(), bitmap.GetHeight() );
char unsigned *data = GetData();
if (!data)
{
gdk_image_destroy( gdk_image );
- wxFAIL_MSG( _T("couldn't create image") );
+ wxFAIL_MSG( wxT("couldn't create image") );
return;
}
SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable
}
- GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
- if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
- int bpp = visual->depth;
- if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
+ int bpp = -1;
+ if (bitmap.GetPixmap())
+ {
+ GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
+
+ if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
+ bpp = visual->depth;
+ if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
+ }
+ if (bitmap.GetBitmap())
+ {
+ bpp = 1;
+ }
GdkColormap *cmap = gtk_widget_get_default_colormap();
for (int i = 0; i < bitmap.GetWidth(); i++)
{
wxInt32 pixel = gdk_image_get_pixel( gdk_image, i, j );
- pixel = wxINT32_SWAP_ON_BE( pixel );
- if (bpp <= 8)
+ if (bpp == 1)
+ {
+ if (pixel == 0)
+ {
+ data[pos] = 0;
+ data[pos+1] = 0;
+ data[pos+2] = 0;
+ }
+ else
+ {
+ data[pos] = 255;
+ data[pos+1] = 255;
+ data[pos+2] = 255;
+ }
+ } else if (bpp <= 8)
{
data[pos] = cmap->colors[pixel].red >> 8;
data[pos+1] = cmap->colors[pixel].green >> 8;
data[pos+2] = cmap->colors[pixel].blue >> 8;
} else if (bpp == 15)
{
+#if (wxBYTE_ORDER == wxBIG_ENDIAN)
+ // ?
+#endif
data[pos] = (pixel >> 7) & 0xf8;
data[pos+1] = (pixel >> 2) & 0xf8;
data[pos+2] = (pixel << 3) & 0xf8;
} else if (bpp == 16)
{
+#if (wxBYTE_ORDER == wxBIG_ENDIAN)
+ // ?
+#endif
data[pos] = (pixel >> 8) & 0xf8;
data[pos+1] = (pixel >> 3) & 0xfc;
data[pos+2] = (pixel << 3) & 0xf8;
} else
{
+#if (wxBYTE_ORDER == wxBIG_ENDIAN)
+ data[pos] = (pixel) & 0xff; // Red
+ data[pos+1] = (pixel >> 8) & 0xff; // Green
+ data[pos+2] = (pixel >> 16) & 0xff; // Blue
+#else
data[pos] = (pixel >> 16) & 0xff;
data[pos+1] = (pixel >> 8) & 0xff;
data[pos+2] = pixel & 0xff;
+#endif
}
if (gdk_image_mask)
//-----------------------------------------------------------------------------
#ifdef __WXMOTIF__
-
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
#include <Xm/Xm.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
#include "wx/utils.h"
#include <math.h>
{
wxBitmap bitmap;
- wxCHECK_MSG( Ok(), bitmap, _T("invalid image") );
+ wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
int width = GetWidth();
int height = GetHeight();
vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
- wxCHECK_MSG( vi, wxNullBitmap, _T("no visual") );
+ wxCHECK_MSG( vi, wxNullBitmap, wxT("no visual") );
XFree( vi );
wxImage::wxImage( const wxBitmap &bitmap )
{
- wxCHECK_RET( bitmap.Ok(), _T("invalid bitmap") );
+ wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") );
Display *dpy = (Display*) wxGetDisplay();
Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) );
bitmap.GetWidth(), bitmap.GetHeight(),
AllPlanes, ZPixmap );
- wxCHECK_RET( ximage, _T("couldn't create image") );
+ wxCHECK_RET( ximage, wxT("couldn't create image") );
Create( bitmap.GetWidth(), bitmap.GetHeight() );
char unsigned *data = GetData();
if (!data)
{
XDestroyImage( ximage );
- wxFAIL_MSG( _T("couldn't create image") );
+ wxFAIL_MSG( wxT("couldn't create image") );
return;
}
vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
- wxCHECK_RET( vi, _T("no visual") );
+ wxCHECK_RET( vi, wxT("no visual") );
if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15;
}
#endif
+#ifdef __WXPM__
+// OS/2 Presentation manager conversion routings
+
+wxBitmap wxImage::ConvertToBitmap() const
+{
+ if ( !Ok() )
+ return wxNullBitmap;
+ wxBitmap bitmap; // remove
+// TODO:
+/*
+ int sizeLimit = 1024*768*3;
+
+ // width and height of the device-dependent bitmap
+ int width = GetWidth();
+ int bmpHeight = GetHeight();
+
+ // calc the number of bytes per scanline and padding
+ int bytePerLine = width*3;
+ int sizeDWORD = sizeof( DWORD );
+ int lineBoundary = bytePerLine % sizeDWORD;
+ int padding = 0;
+ if( lineBoundary > 0 )
+ {
+ padding = sizeDWORD - lineBoundary;
+ bytePerLine += padding;
+ }
+ // calc the number of DIBs and heights of DIBs
+ int numDIB = 1;
+ int hRemain = 0;
+ int height = sizeLimit/bytePerLine;
+ if( height >= bmpHeight )
+ height = bmpHeight;
+ else
+ {
+ numDIB = bmpHeight / height;
+ hRemain = bmpHeight % height;
+ if( hRemain >0 ) numDIB++;
+ }
+
+ // set bitmap parameters
+ wxBitmap bitmap;
+ wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") );
+ bitmap.SetWidth( width );
+ bitmap.SetHeight( bmpHeight );
+ bitmap.SetDepth( wxDisplayDepth() );
+
+ // create a DIB header
+ int headersize = sizeof(BITMAPINFOHEADER);
+ LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
+ wxCHECK_MSG( lpDIBh, bitmap, wxT("could not allocate memory for DIB header") );
+ // Fill in the DIB header
+ lpDIBh->bmiHeader.biSize = headersize;
+ lpDIBh->bmiHeader.biWidth = (DWORD)width;
+ lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
+ lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+ // the general formula for biSizeImage:
+ // ( ( ( ((DWORD)width*24) +31 ) & ~31 ) >> 3 ) * height;
+ lpDIBh->bmiHeader.biPlanes = 1;
+ lpDIBh->bmiHeader.biBitCount = 24;
+ lpDIBh->bmiHeader.biCompression = BI_RGB;
+ lpDIBh->bmiHeader.biClrUsed = 0;
+ // These seem not really needed for our purpose here.
+ lpDIBh->bmiHeader.biClrImportant = 0;
+ lpDIBh->bmiHeader.biXPelsPerMeter = 0;
+ lpDIBh->bmiHeader.biYPelsPerMeter = 0;
+ // memory for DIB data
+ unsigned char *lpBits;
+ lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage );
+ if( !lpBits )
+ {
+ wxFAIL_MSG( wxT("could not allocate memory for DIB") );
+ free( lpDIBh );
+ return bitmap;
+ }
+
+ // create and set the device-dependent bitmap
+ HDC hdc = ::GetDC(NULL);
+ HDC memdc = ::CreateCompatibleDC( hdc );
+ HBITMAP hbitmap;
+ hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight );
+ ::SelectObject( memdc, hbitmap);
+
+ // copy image data into DIB data and then into DDB (in a loop)
+ unsigned char *data = GetData();
+ int i, j, n;
+ int origin = 0;
+ unsigned char *ptdata = data;
+ unsigned char *ptbits;
+
+ for( n=0; n<numDIB; n++ )
+ {
+ if( numDIB > 1 && n == numDIB-1 && hRemain > 0 )
+ {
+ // redefine height and size of the (possibly) last smaller DIB
+ // memory is not reallocated
+ height = hRemain;
+ lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
+ lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+ }
+ ptbits = lpBits;
+
+ for( j=0; j<height; j++ )
+ {
+ for( i=0; i<width; i++ )
+ {
+ *(ptbits++) = *(ptdata+2);
+ *(ptbits++) = *(ptdata+1);
+ *(ptbits++) = *(ptdata );
+ ptdata += 3;
+ }
+ for( i=0; i< padding; i++ ) *(ptbits++) = 0;
+ }
+ ::StretchDIBits( memdc, 0, origin, width, height,\
+ 0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
+ origin += height;
+ // if numDIB = 1, lines below can also be used
+ // hbitmap = CreateDIBitmap( hdc, &(lpDIBh->bmiHeader), CBM_INIT, lpBits, lpDIBh, DIB_RGB_COLORS );
+ // The above line is equivalent to the following two lines.
+ // hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
+ // ::SetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS);
+ // or the following lines
+ // hbitmap = ::CreateCompatibleBitmap( hdc, width, height );
+ // HDC memdc = ::CreateCompatibleDC( hdc );
+ // ::SelectObject( memdc, hbitmap);
+ // ::SetDIBitsToDevice( memdc, 0, 0, width, height,
+ // 0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS);
+ // ::SelectObject( memdc, 0 );
+ // ::DeleteDC( memdc );
+ }
+ bitmap.SetHBITMAP( (WXHBITMAP) hbitmap );
+
+ // similarly, created an mono-bitmap for the possible mask
+ if( HasMask() )
+ {
+ hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL );
+ ::SelectObject( memdc, hbitmap);
+ if( numDIB == 1 ) height = bmpHeight;
+ else height = sizeLimit/bytePerLine;
+ lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
+ lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+ origin = 0;
+ unsigned char r = GetMaskRed();
+ unsigned char g = GetMaskGreen();
+ unsigned char b = GetMaskBlue();
+ unsigned char zero = 0, one = 255;
+ ptdata = data;
+ for( n=0; n<numDIB; n++ )
+ {
+ if( numDIB > 1 && n == numDIB - 1 && hRemain > 0 )
+ {
+ // redefine height and size of the (possibly) last smaller DIB
+ // memory is not reallocated
+ height = hRemain;
+ lpDIBh->bmiHeader.biHeight = (DWORD)(-height);
+ lpDIBh->bmiHeader.biSizeImage = bytePerLine*height;
+ }
+ ptbits = lpBits;
+ for( int j=0; j<height; j++ )
+ {
+ for(i=0; i<width; i++ )
+ {
+ if( (*(ptdata++)!=r) | (*(ptdata++)!=g) | (*(ptdata++)!=b) )
+ {
+ *(ptbits++) = one;
+ *(ptbits++) = one;
+ *(ptbits++) = one;
+ }
+ else
+ {
+ *(ptbits++) = zero;
+ *(ptbits++) = zero;
+ *(ptbits++) = zero;
+ }
+ }
+ for( i=0; i< padding; i++ ) *(ptbits++) = zero;
+ }
+ ::StretchDIBits( memdc, 0, origin, width, height,\
+ 0, 0, width, height, lpBits, lpDIBh, DIB_RGB_COLORS, SRCCOPY);
+ origin += height;
+ }
+ // create a wxMask object
+ wxMask *mask = new wxMask();
+ mask->SetMaskBitmap( (WXHBITMAP) hbitmap );
+ bitmap.SetMask( mask );
+ }
+
+ // free allocated resources
+ ::SelectObject( memdc, 0 );
+ ::DeleteDC( memdc );
+ ::ReleaseDC(NULL, hdc);
+ free(lpDIBh);
+ free(lpBits);
+
+ // check the wxBitmap object
+ if( bitmap.GetHBITMAP() )
+ bitmap.SetOk( TRUE );
+ else
+ bitmap.SetOk( FALSE );
+*/
+ return bitmap;
+}
+
+wxImage::wxImage( const wxBitmap &bitmap )
+{
+ // check the bitmap
+ if( !bitmap.Ok() )
+ {
+ wxFAIL_MSG( wxT("invalid bitmap") );
+ return;
+ }
+
+ // create an wxImage object
+ int width = bitmap.GetWidth();
+ int height = bitmap.GetHeight();
+ Create( width, height );
+ unsigned char *data = GetData();
+ if( !data )
+ {
+ wxFAIL_MSG( wxT("could not allocate data for image") );
+ return;
+ }
+
+ // calc the number of bytes per scanline and padding in the DIB
+ int bytePerLine = width*3;
+ int sizeDWORD = sizeof( DWORD );
+ int lineBoundary = bytePerLine % sizeDWORD;
+ int padding = 0;
+ if( lineBoundary > 0 )
+ {
+ padding = sizeDWORD - lineBoundary;
+ bytePerLine += padding;
+ }
+// TODO:
+/*
+ // create a DIB header
+ int headersize = sizeof(BITMAPINFOHEADER);
+ LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
+ if( !lpDIBh )
+ {
+ wxFAIL_MSG( wxT("could not allocate data for DIB header") );
+ free( data );
+ return;
+ }
+ // Fill in the DIB header
+ lpDIBh->bmiHeader.biSize = headersize;
+ lpDIBh->bmiHeader.biWidth = width;
+ lpDIBh->bmiHeader.biHeight = -height;
+ lpDIBh->bmiHeader.biSizeImage = bytePerLine * height;
+ lpDIBh->bmiHeader.biPlanes = 1;
+ lpDIBh->bmiHeader.biBitCount = 24;
+ lpDIBh->bmiHeader.biCompression = BI_RGB;
+ lpDIBh->bmiHeader.biClrUsed = 0;
+ // These seem not really needed for our purpose here.
+ lpDIBh->bmiHeader.biClrImportant = 0;
+ lpDIBh->bmiHeader.biXPelsPerMeter = 0;
+ lpDIBh->bmiHeader.biYPelsPerMeter = 0;
+ // memory for DIB data
+ unsigned char *lpBits;
+ lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
+ if( !lpBits )
+ {
+ wxFAIL_MSG( wxT("could not allocate data for DIB") );
+ free( data );
+ free( lpDIBh );
+ return;
+ }
+
+ // copy data from the device-dependent bitmap to the DIB
+ HDC hdc = ::GetDC(NULL);
+ HBITMAP hbitmap;
+ hbitmap = (HBITMAP) bitmap.GetHBITMAP();
+ ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
+
+ // copy DIB data into the wxImage object
+ int i, j;
+ unsigned char *ptdata = data;
+ unsigned char *ptbits = lpBits;
+ for( i=0; i<height; i++ )
+ {
+ for( j=0; j<width; j++ )
+ {
+ *(ptdata++) = *(ptbits+2);
+ *(ptdata++) = *(ptbits+1);
+ *(ptdata++) = *(ptbits );
+ ptbits += 3;
+ }
+ ptbits += padding;
+ }
+
+ // similarly, set data according to the possible mask bitmap
+ if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
+ {
+ hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap();
+ // memory DC created, color set, data copied, and memory DC deleted
+ HDC memdc = ::CreateCompatibleDC( hdc );
+ ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
+ ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
+ ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
+ ::DeleteDC( memdc );
+ // background color set to RGB(16,16,16) in consistent with wxGTK
+ unsigned char r=16, g=16, b=16;
+ ptdata = data;
+ ptbits = lpBits;
+ for( i=0; i<height; i++ )
+ {
+ for( j=0; j<width; j++ )
+ {
+ if( *ptbits != 0 )
+ ptdata += 3;
+ else
+ {
+ *(ptdata++) = r;
+ *(ptdata++) = g;
+ *(ptdata++) = b;
+ }
+ ptbits += 3;
+ }
+ ptbits += padding;
+ }
+ SetMaskColour( r, g, b );
+ SetMask( TRUE );
+ }
+ else
+ {
+ SetMask( FALSE );
+ }
+ // free allocated resources
+ ::ReleaseDC(NULL, hdc);
+ free(lpDIBh);
+ free(lpBits);
+*/
+}
+
+#endif
+
// A module to allow wxImage initialization/cleanup
// without calling these functions from app.cpp or from
// the user's application.
};
IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
+
+
+//-----------------------------------------------------------------------------
+
+// GRG, Dic/99
+// Counts and returns the number of different colours. Optionally stops
+// when it exceeds 'stopafter' different colours. This is useful, for
+// example, to see if the image can be saved as 8-bit (256 colour or
+// less, in this case it would be invoked as CountColours(256)). Default
+// value for stopafter is -1 (don't care).
+//
+unsigned long wxImage::CountColours( unsigned long stopafter )
+{
+ wxHashTable h;
+ wxNode *node;
+ wxHNode *hnode;
+ unsigned char r, g, b, *p;
+ unsigned long size, nentries, key;
+
+ p = GetData();
+ size = GetWidth() * GetHeight();
+ nentries = 0;
+
+ for (unsigned long j = 0; (j < size) && (nentries <= stopafter) ; j++)
+ {
+ r = *(p++);
+ g = *(p++);
+ b = *(p++);
+ key = (r << 16) | (g << 8) | b;
+
+ hnode = (wxHNode *) h.Get(key);
+
+ if (!hnode)
+ {
+ h.Put(key, (wxObject *)(new wxHNode));
+ nentries++;
+ }
+ }
+
+ // delete all HNodes
+ h.BeginFind();
+ while ((node = h.Next()) != NULL)
+ delete (wxHNode *)node->GetData();
+
+ return nentries;
+}
+
+
+// GRG, Dic/99
+// Computes the histogram of the image and fills a hash table, indexed
+// with integer keys built as 0xRRGGBB, containing wxHNode objects. Each
+// wxHNode contains an 'index' (useful to build a palette with the image
+// colours) and a 'value', which is the number of pixels in the image with
+// that colour.
+//
+unsigned long wxImage::ComputeHistogram( wxHashTable &h )
+{
+ unsigned char r, g, b, *p;
+ unsigned long size, nentries, key;
+ wxHNode *hnode;
+
+ p = GetData();
+ size = GetWidth() * GetHeight();
+ nentries = 0;
+
+ for (unsigned long j = 0; j < size; j++)
+ {
+ r = *(p++);
+ g = *(p++);
+ b = *(p++);
+ key = (r << 16) | (g << 8) | b;
+
+ hnode = (wxHNode *) h.Get(key);
+
+ if (hnode)
+ hnode->value++;
+ else
+ {
+ hnode = new wxHNode();
+ hnode->index = nentries++;
+ hnode->value = 1;
+
+ h.Put(key, (wxObject *)hnode);
+ }
+ }
+
+ return nentries;
+}
+
+
projects / wxWidgets.git / blobdiff