Fixed filename in wxOSX-Cocoa's file dialog using extension of wrong file type.

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

diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index d8396837c4da5146624bc10e19b1a5f349eb71e7..5cf71c16727912698a15276b8bfdc855eeb20bef 100644 (file)
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -31,6 +31,13 @@
 
 #include <mgraph.hpp>
 
 
 #include <mgraph.hpp>
 

+static bitmap_t *MyMGL_createBitmap(int width, int height,
+                                    int bpp, pixel_format_t *pf)
+{
+    MGLMemoryDC mdc(width, height, bpp, pf);
+    return MGL_getBitmapFromDC(mdc.getDC(), 0, 0, width, height, TRUE);
+}
+

 //-----------------------------------------------------------------------------
 // MGL pixel formats:
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // MGL pixel formats:
 //-----------------------------------------------------------------------------


@@ -51,67 +58,35 @@ static pixel_format_t gs_pixel_format_wxImage =
     {0xFF,0x00,0, 0xFF,0x08,0, 0xFF,0x10,0, 0x00,0x00,0}; // RGB 24bpp for wxImage
 
 //-----------------------------------------------------------------------------
     {0xFF,0x00,0, 0xFF,0x08,0, 0xFF,0x10,0, 0x00,0x00,0}; // RGB 24bpp for wxImage
 
 //-----------------------------------------------------------------------------

-// wxBitmap
+// wxBitmapRefData

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxBitmapRefData: public wxObjectRefData
+class wxBitmapRefData: public wxGDIRefData

 {
 public:
     wxBitmapRefData();
 {
 public:
     wxBitmapRefData();

+    wxBitmapRefData(int width, int height, int bpp);
+    wxBitmapRefData(const wxBitmapRefData& data);

     virtual ~wxBitmapRefData();
 
     virtual ~wxBitmapRefData();
 

+    virtual bool IsOk() const { return m_bitmap != NULL; }
+

     int             m_width;
     int             m_height;
     int             m_bpp;
     wxPalette      *m_palette;
     wxMask         *m_mask;
     bitmap_t       *m_bitmap;
     int             m_width;
     int             m_height;
     int             m_bpp;
     wxPalette      *m_palette;
     wxMask         *m_mask;
     bitmap_t       *m_bitmap;

-};

 
 

-wxBitmapRefData::wxBitmapRefData()
-{
-    m_mask = NULL;
-    m_width = 0;
-    m_height = 0;
-    m_bpp = 0;
-    m_palette = NULL;
-    m_bitmap = NULL;
-}
-
-wxBitmapRefData::~wxBitmapRefData()
-{
-    if ( m_bitmap )
-        MGL_unloadBitmap(m_bitmap);
-    delete m_mask;
-    delete m_palette;
-}
-
-//-----------------------------------------------------------------------------
-
-#define M_BMPDATA ((wxBitmapRefData *)m_refData)
-
-
-IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxBitmapBase)
-
-wxBitmap::wxBitmap(int width, int height, int depth)
-{
-    Create(width, height, depth);
-}
-
-
-static bitmap_t *MyMGL_createBitmap(int width, int height,
-                                    int bpp, pixel_format_t *pf)
-{
-    MGLMemoryDC mdc(width, height, bpp, pf);
-    return MGL_getBitmapFromDC(mdc.getDC(), 0, 0, width, height, TRUE);
-}
+private:
+    void DoCreateBitmap(int width, int height, int depth);
+};

 
 

-bool wxBitmap::Create(int width, int height, int depth)
+void wxBitmapRefData::DoCreateBitmap(int width, int height, int depth)

 {
 {

-    UnRef();
-
-    wxCHECK_MSG( (width > 0) && (height > 0), false, wxT("invalid bitmap size") );
+    m_width = width;
+    m_height = height;
+    m_bpp = depth;

 
     pixel_format_t pf_dummy;
     pixel_format_t *pf;
 
     pixel_format_t pf_dummy;
     pixel_format_t *pf;


@@ -129,6 +104,7 @@ bool wxBitmap::Create(int width, int height, int depth)
         case 1:
         case 8:
             pf = NULL;
         case 1:
         case 8:
             pf = NULL;

+            mglDepth = 8; // we emulate monochrome bitmaps using 8 bit ones

             break;
         case 15:
             pf = &gs_pixel_format_15;
             break;
         case 15:
             pf = &gs_pixel_format_15;


@@ -144,27 +120,81 @@ bool wxBitmap::Create(int width, int height, int depth)
             break;
         default:
             wxFAIL_MSG(wxT("invalid bitmap depth"));
             break;
         default:
             wxFAIL_MSG(wxT("invalid bitmap depth"));

-            return false;
+            m_bitmap = NULL;
+            return;

     }
 
     }
 

-    m_refData = new wxBitmapRefData();
-    M_BMPDATA->m_mask = (wxMask *) NULL;
-    M_BMPDATA->m_palette = (wxPalette *) NULL;
-    M_BMPDATA->m_width = width;
-    M_BMPDATA->m_height = height;
-    M_BMPDATA->m_bpp = mglDepth;
+    m_bitmap = MyMGL_createBitmap(width, height, mglDepth, pf);
+}

 
 

-    if ( mglDepth != 1 )
-    {
-        M_BMPDATA->m_bitmap = MyMGL_createBitmap(width, height, mglDepth, pf);
-    }
-    else
+wxBitmapRefData::wxBitmapRefData()
+{
+    m_width =
+    m_height =
+    m_bpp = 0;
+
+    m_palette = NULL;
+    m_mask = NULL;
+
+    m_bitmap = NULL;
+}
+
+wxBitmapRefData::wxBitmapRefData(int width, int height, int bpp)
+{
+    DoCreateBitmap(width, height, bpp);
+
+    m_palette = NULL;
+    m_mask = NULL;
+}
+
+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
+{
+    DoCreateBitmap(data.m_width, data.m_height, data.m_bpp);
+
+    m_palette = NULL; // FIXME: should copy
+    m_mask = NULL; // FIXME: should copy
+}
+
+wxBitmapRefData::~wxBitmapRefData()
+{
+    if ( m_bitmap )
+        MGL_unloadBitmap(m_bitmap);
+    delete m_mask;
+    delete m_palette;
+}
+
+
+//-----------------------------------------------------------------------------
+// wxBitmap
+//-----------------------------------------------------------------------------
+
+#define M_BMPDATA ((wxBitmapRefData *)m_refData)
+
+IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxBitmapBase)
+
+wxGDIRefData *wxBitmap::CreateGDIRefData() const
+{
+    return new wxBitmapRefData;
+}
+
+wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxBitmapRefData(*static_cast<const wxBitmapRefData *>(data));
+}
+
+bool wxBitmap::Create(int width, int height, int depth)
+{
+    UnRef();
+
+    wxCHECK_MSG( (width > 0) && (height > 0), false, wxT("invalid bitmap size") );
+
+    m_refData = new wxBitmapRefData(width, height, depth);
+
+    if ( depth == 1 )

     {
         // MGL does not support mono DCs, so we have to emulate them with
         // 8bpp ones. We do that by using a special palette with color 0
         // set to black and all other colors set to white.
     {
         // MGL does not support mono DCs, so we have to emulate them with
         // 8bpp ones. We do that by using a special palette with color 0
         // set to black and all other colors set to white.

-
-        M_BMPDATA->m_bitmap = MyMGL_createBitmap(width, height, 8, pf);

         SetMonoPalette(wxColour(255, 255, 255), wxColour(0, 0, 0));
     }
 
         SetMonoPalette(wxColour(255, 255, 255), wxColour(0, 0, 0));
     }
 


@@ -267,11 +297,6 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
     delete bdc;
 }
 
     delete bdc;
 }
 

-bool wxBitmap::IsOk() const
-{
-    return (m_refData != NULL && M_BMPDATA->m_bitmap != NULL);
-}
-

 int wxBitmap::GetHeight() const
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
 int wxBitmap::GetHeight() const
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );


@@ -295,7 +320,7 @@ int wxBitmap::GetDepth() const
 
 wxMask *wxBitmap::GetMask() const
 {
 
 wxMask *wxBitmap::GetMask() const
 {

-    wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_mask;
 }
 
     return M_BMPDATA->m_mask;
 }


@@ -403,7 +428,7 @@ MGLDevCtx *wxBitmap::CreateTmpDC() const
 
 bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type)
 {
 
 bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type)
 {

-    UnRef();
+    AllocExclusive();

 
     if ( type == wxBITMAP_TYPE_BMP || type == wxBITMAP_TYPE_PNG ||
          type == wxBITMAP_TYPE_PCX || type == wxBITMAP_TYPE_JPEG )
 
     if ( type == wxBITMAP_TYPE_BMP || type == wxBITMAP_TYPE_PNG ||
          type == wxBITMAP_TYPE_PCX || type == wxBITMAP_TYPE_JPEG )


@@ -433,8 +458,6 @@ bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type)
         }
     }
 
         }
     }
 

-    m_refData = new wxBitmapRefData();
-

     return handler->LoadFile(this, name, type, -1, -1);
 }
 
     return handler->LoadFile(this, name, type, -1, -1);
 }
 


@@ -475,8 +498,7 @@ void wxBitmap::SetPalette(const wxPalette& palette)
     wxCHECK_RET( GetDepth() > 1 && GetDepth() <= 8, wxT("cannot set palette for bitmap of this depth") );
 
     AllocExclusive();
     wxCHECK_RET( GetDepth() > 1 && GetDepth() <= 8, wxT("cannot set palette for bitmap of this depth") );
 
     AllocExclusive();

-    delete M_BMPDATA->m_palette;
-    M_BMPDATA->m_palette = NULL;
+    wxDELETE(M_BMPDATA->m_palette);

 
     if ( !palette.Ok() ) return;
 
 
     if ( !palette.Ok() ) return;
 


@@ -647,7 +669,7 @@ bool wxMGLBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name,
     int w = bitmap->GetWidth(),
         h = bitmap->GetHeight();
 
     int w = bitmap->GetWidth(),
         h = bitmap->GetHeight();
 

-    mem.SelectObject(*bitmap);
+    mem.SelectObjectAsSource(*bitmap);

     tdc = mem.GetMGLDC();
 
     switch (type)
     tdc = mem.GetMGLDC();
 
     switch (type)