Applied patch [ 735948 ] wxStaticPicture contrib

[wxWidgets.git] / samples / image / image.cpp

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index b0e8976aca6011e905b0ee8f11a09fb91fbbc784..734eadf90e1ff4d76b90788b367c9bd51115d83f 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -34,10 +34,8 @@
 #if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
     #include "smile.xpm"
 #endif
 #if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
     #include "smile.xpm"
 #endif

+#include "wx/rawbmp.h"

 
 

-#if defined(__WXMSW__)
-    #define wxHAVE_RAW_BITMAP
-#endif

 
 // derived classes
 
 
 // derived classes
 


@@ -145,7 +143,7 @@ public:
     MyImageFrame(wxFrame *parent, const wxBitmap& bitmap)
         : wxFrame(parent, -1, _T("Double click to save"),
                   wxDefaultPosition, wxDefaultSize,
     MyImageFrame(wxFrame *parent, const wxBitmap& bitmap)
         : wxFrame(parent, -1, _T("Double click to save"),
                   wxDefaultPosition, wxDefaultSize,

-                  wxCAPTION | wxSYSTEM_MENU),
+                  wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX),

                   m_bitmap(bitmap)
     {
         SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());
                   m_bitmap(bitmap)
     {
         SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());


@@ -260,20 +258,22 @@ public:
     {
         SetClientSize(SIZE, SIZE);
 
     {
         SetClientSize(SIZE, SIZE);
 

-        wxRawBitmapData data(m_bitmap);
+        wxAlphaPixelData data(m_bitmap,
+                              wxPoint(BORDER, BORDER),
+                              wxSize(REAL_SIZE, REAL_SIZE));

         if ( !data )
         {
             wxLogError(_T("Failed to gain raw access to bitmap data"));
             return;
         }
 
         if ( !data )
         {
             wxLogError(_T("Failed to gain raw access to bitmap data"));
             return;
         }
 

-        wxRawBitmapIterator p(data);
+        data.UseAlpha();

 
 

-        p.Offset(BORDER, BORDER);
+        wxAlphaPixelData::Iterator p(data);

 
         for ( int y = 0; y < REAL_SIZE; ++y )
         {
 
         for ( int y = 0; y < REAL_SIZE; ++y )
         {

-            wxRawBitmapIterator rowStart = p;
+            wxAlphaPixelData::Iterator rowStart = p;

 
             int r = y < REAL_SIZE/3 ? 255 : 0,
                 g = (REAL_SIZE/3 <= y) && (y < 2*(REAL_SIZE/3)) ? 255 : 0,
 
             int r = y < REAL_SIZE/3 ? 255 : 0,
                 g = (REAL_SIZE/3 <= y) && (y < 2*(REAL_SIZE/3)) ? 255 : 0,


@@ -284,13 +284,13 @@ public:
                 p.Red() = r;
                 p.Green() = g;
                 p.Blue() = b;
                 p.Red() = r;
                 p.Green() = g;
                 p.Blue() = b;

-                p.Alpha() = x;
+                p.Alpha() = (x*255.)/REAL_SIZE;

 
                 ++p; // same as p.OffsetX(1)
             }
 
             p = rowStart;
 
                 ++p; // same as p.OffsetX(1)
             }
 
             p = rowStart;

-            p.OffsetY(1);
+            p.OffsetY(data, 1);

         }
     }
 
         }
     }
 


@@ -404,8 +404,8 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     image.Destroy();
 
 
     image.Destroy();
 

-    image.LoadFile( dir + _T("test.png") );
-    my_square = new wxBitmap( image );
+    if ( image.LoadFile( dir + _T("test.png") ) )
+        my_square = new wxBitmap( image );

 
     image.Destroy();
 
 
     image.Destroy();
 


@@ -547,20 +547,23 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     // test image loading from stream
     wxFile file(dir + _T("horse.bmp"));
 
     // test image loading from stream
     wxFile file(dir + _T("horse.bmp"));

-    off_t len = file.Length();
-    void *data = malloc(len);
-    if ( file.Read(data, len) != len )
-        wxLogError(_T("Reading bitmap file failed"));
-    else
+    if ( file.IsOpened() )

     {
     {

-        wxMemoryInputStream mis(data, len);
-        if ( !image.LoadFile(mis) )
-            wxLogError(wxT("Can't load BMP image from stream"));
+        off_t len = file.Length();
+        void *data = malloc(len);
+        if ( file.Read(data, len) != len )
+            wxLogError(_T("Reading bitmap file failed"));

         else
         else

-            my_horse_bmp2 = new wxBitmap( image );
-    }
+        {
+            wxMemoryInputStream mis(data, len);
+            if ( !image.LoadFile(mis) )
+                wxLogError(wxT("Can't load BMP image from stream"));
+            else
+                my_horse_bmp2 = new wxBitmap( image );
+        }

 
 

-    free(data);
+        free(data);
+    }

 }
 
 MyCanvas::~MyCanvas()
 }
 
 MyCanvas::~MyCanvas()


@@ -828,6 +831,7 @@ MyFrame::MyFrame()
 
   wxMenu *menuImage = new wxMenu;
   menuImage->Append( ID_NEW, _T("&Show any image...\tCtrl-O"));
 
   wxMenu *menuImage = new wxMenu;
   menuImage->Append( ID_NEW, _T("&Show any image...\tCtrl-O"));

+

 #ifdef wxHAVE_RAW_BITMAP
   menuImage->Append( ID_SHOWRAW, _T("Test &raw bitmap...\tCtrl-R"));
 #endif
 #ifdef wxHAVE_RAW_BITMAP
   menuImage->Append( ID_SHOWRAW, _T("Test &raw bitmap...\tCtrl-R"));
 #endif


@@ -901,15 +905,21 @@ void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event))
     wxBitmapDataObject *dobjBmp = new wxBitmapDataObject;
     dobjBmp->SetBitmap(*m_canvas->my_horse_png);
 
     wxBitmapDataObject *dobjBmp = new wxBitmapDataObject;
     dobjBmp->SetBitmap(*m_canvas->my_horse_png);
 

+    wxTheClipboard->Open();
+

     if ( !wxTheClipboard->SetData(dobjBmp) )
     {
         wxLogError(_T("Failed to copy bitmap to clipboard"));
     }
     if ( !wxTheClipboard->SetData(dobjBmp) )
     {
         wxLogError(_T("Failed to copy bitmap to clipboard"));
     }

+
+    wxTheClipboard->Close();

 }
 
 void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
 {
     wxBitmapDataObject dobjBmp;
 }
 
 void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
 {
     wxBitmapDataObject dobjBmp;

+
+    wxTheClipboard->Open();

     if ( !wxTheClipboard->GetData(dobjBmp) )
     {
         wxLogMessage(_T("No bitmap data in the clipboard"));
     if ( !wxTheClipboard->GetData(dobjBmp) )
     {
         wxLogMessage(_T("No bitmap data in the clipboard"));


@@ -918,6 +928,7 @@ void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
     {
         (new MyImageFrame(this, dobjBmp.GetBitmap()))->Show();
     }
     {
         (new MyImageFrame(this, dobjBmp.GetBitmap()))->Show();
     }

+    wxTheClipboard->Close();

 }
 
 #endif // wxUSE_CLIPBOARD
 }
 
 #endif // wxUSE_CLIPBOARD