X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d2f48b681fb685eb372f171b93f824fc9849e59..b911bc32a17f592214fcc37bb942ad3f355e6893:/samples/image/image.cpp?ds=sidebyside

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index c2abf84360..61fb9a85d4 100644
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -34,9 +34,10 @@
 #if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
     #include "smile.xpm"
 #endif
+#ifndef __VMS
+# include "wx/rawbmp.h"
 
-#if defined(__WXMSW__)
-    #define wxHAVE_RAW_BITMAP
+#define wxHAVE_RAW_BITMAP
 #endif
 
 // derived classes
@@ -127,7 +128,7 @@ public:
 #endif // wxHAVE_RAW_BITMAP
     void OnQuit( wxCommandEvent &event );
 
-#if wxUSE_CLIPBOARD && !defined(__WXMOTIF_)
+#if wxUSE_CLIPBOARD
     void OnCopy(wxCommandEvent& event);
     void OnPaste(wxCommandEvent& event);
 #endif // wxUSE_CLIPBOARD
@@ -260,7 +261,9 @@ public:
     {
         SetClientSize(SIZE, SIZE);
 
-        wxAlphaPixelData 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"));
@@ -271,8 +274,6 @@ public:
 
         wxAlphaPixelData::Iterator p(data);
 
-        p.Offset(data, BORDER, BORDER);
-
         for ( int y = 0; y < REAL_SIZE; ++y )
         {
             wxAlphaPixelData::Iterator rowStart = p;
@@ -286,7 +287,8 @@ public:
                 p.Red() = r;
                 p.Green() = g;
                 p.Blue() = b;
-                p.Alpha() = (x*255.)/REAL_SIZE;
+                p.Alpha() =
+                    (wxAlphaPixelFormat::ChannelType)((x*255.)/REAL_SIZE);
 
                 ++p; // same as p.OffsetX(1)
             }
@@ -819,7 +821,7 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame)
   EVT_MENU    (ID_SHOWRAW,  MyFrame::OnTestRawBitmap)
 #endif
 
-#if wxUSE_CLIPBOARD && !defined(__WXMOTIF__)
+#if wxUSE_CLIPBOARD
     EVT_MENU(wxID_COPY, MyFrame::OnCopy)
     EVT_MENU(wxID_PASTE, MyFrame::OnPaste)
 #endif // wxUSE_CLIPBOARD
@@ -833,6 +835,7 @@ MyFrame::MyFrame()
 
   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
@@ -842,7 +845,7 @@ MyFrame::MyFrame()
   menuImage->Append( ID_QUIT, _T("E&xit\tCtrl-Q"));
   menu_bar->Append(menuImage, _T("&Image"));
 
-#if wxUSE_CLIPBOARD && !defined(__WXMOTIF__)
+#if wxUSE_CLIPBOARD
   wxMenu *menuClipboard = new wxMenu;
   menuClipboard->Append(wxID_COPY, _T("&Copy test image\tCtrl-C"));
   menuClipboard->Append(wxID_PASTE, _T("&Paste image\tCtrl-V"));
@@ -899,22 +902,28 @@ void MyFrame::OnTestRawBitmap( wxCommandEvent &event )
 
 #endif // wxHAVE_RAW_BITMAP
 
-#if wxUSE_CLIPBOARD && !defined(__WXMOTIF__)
+#if wxUSE_CLIPBOARD
 
 void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event))
 {
     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"));
     }
+
+    wxTheClipboard->Close();
 }
 
 void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
 {
     wxBitmapDataObject dobjBmp;
+
+    wxTheClipboard->Open();
     if ( !wxTheClipboard->GetData(dobjBmp) )
     {
         wxLogMessage(_T("No bitmap data in the clipboard"));
@@ -923,6 +932,7 @@ void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
     {
         (new MyImageFrame(this, dobjBmp.GetBitmap()))->Show();
     }
+    wxTheClipboard->Close();
 }
 
 #endif // wxUSE_CLIPBOARD