Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected wxImage for use with mono wxBitmaps,

Browse Source 
Corrected compilation of wxApp without threads (untested).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-10-18 08:51:23 +00:00
parent d90895ac11
commit c6d73ef67d
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/app.h
View File

@@ -59,9 +59,7 @@ public:
static void CleanUp();
bool ProcessIdle();
#if wxUSE_THREADS
void ProcessPendingEvents();
#endif
void DeletePendingObjects();
// This can be used to suppress the generation of Idle events.

2
include/wx/gtk1/app.h
View File

@@ -59,9 +59,7 @@ public:
static void CleanUp();
bool ProcessIdle();
#if wxUSE_THREADS
void ProcessPendingEvents();
#endif
void DeletePendingObjects();
// This can be used to suppress the generation of Idle events.

2
samples/image/Makefile.in
View File

@@ -13,7 +13,7 @@ top_srcdir = @top_srcdir@
top_builddir = ../..
program_dir = samples/image
DATAFILES = horse.png horse.jpg horse.bmp horse.gif horse.pcx
DATAFILES = horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm
PROGRAM=image

28
src/common/image.cpp
View File

@@ -1238,9 +1238,22 @@ wxImage::wxImage( const wxBitmap &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, wxT("couldn't create image") );
@@ -1264,7 +1277,12 @@ wxImage::wxImage( const wxBitmap &bitmap )
SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable
}
GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
GdkVisual *visual = (GdkVisual*) NULL;
if (bitmap.GetPixmap())
visual = gdk_window_get_visual( bitmap.GetPixmap() );
else
visual = gdk_window_get_visual( bitmap.GetBitmap() );
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;
@@ -1277,7 +1295,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
for (int i = 0; i < bitmap.GetWidth(); i++)
{
wxInt32 pixel = gdk_image_get_pixel( gdk_image, i, j );
pixel = wxINT32_SWAP_ON_BE( pixel );
// pixel = wxINT32_SWAP_ON_BE( pixel );
if (bpp <= 8)
{
data[pos] = cmap->colors[pixel].red >> 8;