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

Various corrections to makefiles, RPMs etc.

Browse Source 
Corrected overoptimised window style and colour code.
  More best visual changes.
  Minor typos in docs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-02-01 16:37:28 +00:00
parent eb17eaba37
commit 103aab2664
17 changed files with 152 additions and 1438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/image.cpp
View File

@@ -1309,12 +1309,15 @@ wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, u
bitmap.SetDepth( 1 );
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
wxASSERT( visual );
// Create picture image
unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
GdkImage *data_image =
gdk_image_new_bitmap( gdk_visual_get_system(), data_data, width, height );
gdk_image_new_bitmap( visual, data_data, width, height );
// Create mask image
@@ -1324,7 +1327,7 @@ wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, u
{
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 );
mask_image = gdk_image_new_bitmap( visual, mask_data, width, height );
wxMask *mask = new wxMask();
mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
@@ -1405,10 +1408,11 @@ wxBitmap wxImage::ConvertToBitmap() const
bitmap.SetPixmap( gdk_pixmap_new( wxRootWindow->window, width, height, -1 ) );
// Retrieve depth
// Retrieve depth
GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
if (visual == NULL) visual = gdk_visual_get_system();
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
wxASSERT( visual );
int bpp = visual->depth;
bitmap.SetDepth( bpp );
@@ -1448,7 +1452,7 @@ wxBitmap wxImage::ConvertToBitmap() const
// Create picture image
GdkImage *data_image =
gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );
gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height );
// Create mask image
@@ -1458,7 +1462,7 @@ wxBitmap wxImage::ConvertToBitmap() const
{
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 );
mask_image = gdk_image_new_bitmap( visual, mask_data, width, height );
wxMask *mask = new wxMask();
mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
@@ -1473,7 +1477,6 @@ wxBitmap wxImage::ConvertToBitmap() const
if (bpp >= 24)
{
GdkVisual *visual = gdk_visual_get_system();
if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask)) b_o = RGB;
else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask)) b_o = RGB;
else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask)) b_o = BRG;