Added style parameter to wxPopupWindow ctors so they match the Create method.

[wxWidgets.git] / src / mgl / bitmap.cpp

diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index 8c634464e4c76cd924bc91a5595876fc683ef678..e3ffeb74304640547e24f681a43d6bf406b2f637 100644 (file)
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -2,7 +2,7 @@
 // Name:        bitmap.cpp
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Name:        bitmap.cpp
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$

-// Copyright:   (c) 2001 Vaclav Slavik
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -48,9 +48,8 @@ static pixel_format_t gs_pixel_format_24 =
 static pixel_format_t gs_pixel_format_32 =
        {0xFF,0x18,0, 0xFF,0x10,0, 0xFF,0x08,0, 0xFF,0x00,0}; // RGBA 32bpp
 
 static pixel_format_t gs_pixel_format_32 =
        {0xFF,0x18,0, 0xFF,0x10,0, 0xFF,0x08,0, 0xFF,0x00,0}; // RGBA 32bpp
 

-// FIXME_MGL -- these formats will probably have to go into another place,
-//              where wxApp could use them to initialize g_displayDC
-
+static pixel_format_t gs_pixel_format_wxImage =
+       {0xFF,0x00,0, 0xFF,0x08,0, 0xFF,0x10,0, 0x00,0x00,0}; // RGB 24bpp for wxImage

 
 //-----------------------------------------------------------------------------
 // wxMask
 
 //-----------------------------------------------------------------------------
 // wxMask


@@ -279,7 +278,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth = -1)
 
     if ( !Create(width, height, depth) ) return;
     
 
     if ( !Create(width, height, depth) ) return;
     

-    MGLMemoryDC idc(width, height, 24, &gs_pixel_format_24,
+    MGLMemoryDC idc(width, height, 24, &gs_pixel_format_wxImage,

                     width * 3, (void*)image.GetData(), NULL);
     wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
 
                     width * 3, (void*)image.GetData(), NULL);
     wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
 


@@ -306,14 +305,14 @@ wxImage wxBitmap::ConvertToImage() const
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
 
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
 

-    long width, height;
+    int width, height;

     width = GetWidth();
     height = GetHeight();
     
     wxImage image(width, height);
     wxASSERT_MSG( image.Ok(), wxT("cannot create image") );
     
     width = GetWidth();
     height = GetHeight();
     
     wxImage image(width, height);
     wxASSERT_MSG( image.Ok(), wxT("cannot create image") );
     

-    MGLMemoryDC idc(width, height, 24, &gs_pixel_format_24,
+    MGLMemoryDC idc(width, height, 24, &gs_pixel_format_wxImage,

                     width * 3, (void*)image.GetData(), NULL);
     wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
 
                     width * 3, (void*)image.GetData(), NULL);
     wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
 


@@ -517,6 +516,7 @@ MGLDevCtx *wxBitmap::CreateTmpDC() const
             case  4: cnt = 16;  break;
             case  8: cnt = 256; break;
             default:
             case  4: cnt = 16;  break;
             case  8: cnt = 256; break;
             default:

+                cnt = 0;

                 wxFAIL_MSG( wxT("bitmap with this depth cannot have palette") );
                 break;
         }
                 wxFAIL_MSG( wxT("bitmap with this depth cannot have palette") );
                 break;
         }