Regenerated makefiles.

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 45aedd53580015fff7d334ef2a90ae6464edf5e0..f51297399ea19fc3ba60c3560c1970ba6fc6b88b 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -24,14 +24,20 @@
 #include "wx/wfstream.h"
 #include "wx/quantize.h"
 
 #include "wx/wfstream.h"
 #include "wx/quantize.h"
 

+#if wxUSE_CLIPBOARD
+    #include "wx/dataobj.h"
+    #include "wx/clipbrd.h"
+#endif // wxUSE_CLIPBOARD
+

 #include "smile.xbm"
 
 #if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
     #include "smile.xpm"
 #endif
 
 #include "smile.xbm"
 
 #if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
     #include "smile.xpm"
 #endif
 

-#if !defined(__WXMOTIF__)
-#define wxHAVE_RAW_BITMAP
+#if defined(__WXMSW__) || defined(__WXMAC__)
+    #include "wx/rawbmp.h"
+    #define wxHAVE_RAW_BITMAP

 #endif
 
 // derived classes
 #endif
 
 // derived classes


@@ -122,6 +128,11 @@ public:
 #endif // wxHAVE_RAW_BITMAP
     void OnQuit( wxCommandEvent &event );
 
 #endif // wxHAVE_RAW_BITMAP
     void OnQuit( wxCommandEvent &event );
 

+#if wxUSE_CLIPBOARD
+    void OnCopy(wxCommandEvent& event);
+    void OnPaste(wxCommandEvent& event);
+#endif // wxUSE_CLIPBOARD
+

     MyCanvas         *m_canvas;
 
 private:
     MyCanvas         *m_canvas;
 
 private:


@@ -135,7 +146,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());


@@ -250,20 +261,24 @@ public:
     {
         SetClientSize(SIZE, SIZE);
 
     {
         SetClientSize(SIZE, SIZE);
 

-        wxRawBitmapData data(m_bitmap);
+        // another possibility: wxNativePixelData (don't forget to remove code
+        // setting alpha in the loop below then)
+        typedef wxAlphaPixelData Data;
+
+        Data 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);
+        Data::Iterator p(data);

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

-            wxRawBitmapIterator rowStart = p;
+            Data::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,


@@ -274,13 +289,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() = (Data::Iterator::ChannelType)((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);

         }
     }
 
         }
     }
 


@@ -394,8 +409,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();
 


@@ -531,28 +546,29 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
         else    
             my_horse_ani [i] = wxBitmap( image );
     }
         else    
             my_horse_ani [i] = wxBitmap( image );
     }

-    
-    
-#endif
+#endif // wxUSE_ICO_CUR

 
     image.Destroy();
 
     // test image loading from stream
     wxFile file(dir + _T("horse.bmp"));
 
     image.Destroy();
 
     // 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()


@@ -805,24 +821,37 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame)
 #ifdef wxHAVE_RAW_BITMAP
   EVT_MENU    (ID_SHOWRAW,  MyFrame::OnTestRawBitmap)
 #endif
 #ifdef wxHAVE_RAW_BITMAP
   EVT_MENU    (ID_SHOWRAW,  MyFrame::OnTestRawBitmap)
 #endif

+
+#if wxUSE_CLIPBOARD
+    EVT_MENU(wxID_COPY, MyFrame::OnCopy)
+    EVT_MENU(wxID_PASTE, MyFrame::OnPaste)
+#endif // wxUSE_CLIPBOARD

 END_EVENT_TABLE()
 
 MyFrame::MyFrame()
        : wxFrame( (wxFrame *)NULL, -1, _T("wxImage sample"),
                   wxPoint(20,20), wxSize(470,360) )
 {
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()
        : wxFrame( (wxFrame *)NULL, -1, _T("wxImage sample"),
                   wxPoint(20,20), wxSize(470,360) )
 {

-  wxMenu *file_menu = new wxMenu();
-  file_menu->Append( ID_NEW, _T("&Show image...\tCtrl-O"));
+  wxMenuBar *menu_bar = new wxMenuBar();
+
+  wxMenu *menuImage = new wxMenu;
+  menuImage->Append( ID_NEW, _T("&Show any image...\tCtrl-O"));
+

 #ifdef wxHAVE_RAW_BITMAP
 #ifdef wxHAVE_RAW_BITMAP

-  file_menu->Append( ID_SHOWRAW, _T("Test &raw bitmap...\tCtrl-R"));
+  menuImage->Append( ID_SHOWRAW, _T("Test &raw bitmap...\tCtrl-R"));

 #endif
 #endif

-  file_menu->AppendSeparator();
-  file_menu->Append( ID_ABOUT, _T("&About..."));
-  file_menu->AppendSeparator();
-  file_menu->Append( ID_QUIT, _T("E&xit\tCtrl-Q"));
-
-  wxMenuBar *menu_bar = new wxMenuBar();
-  menu_bar->Append(file_menu, _T("&File"));
+  menuImage->AppendSeparator();
+  menuImage->Append( ID_ABOUT, _T("&About..."));
+  menuImage->AppendSeparator();
+  menuImage->Append( ID_QUIT, _T("E&xit\tCtrl-Q"));
+  menu_bar->Append(menuImage, _T("&Image"));
+
+#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"));
+  menu_bar->Append(menuClipboard, _T("&Clipboard"));
+#endif // wxUSE_CLIPBOARD

 
   SetMenuBar( menu_bar );
 
 
   SetMenuBar( menu_bar );
 


@@ -874,6 +903,41 @@ void MyFrame::OnTestRawBitmap( wxCommandEvent &event )
 
 #endif // wxHAVE_RAW_BITMAP
 
 
 #endif // wxHAVE_RAW_BITMAP
 

+#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"));
+    }
+    else
+    {
+        (new MyImageFrame(this, dobjBmp.GetBitmap()))->Show();
+    }
+    wxTheClipboard->Close();
+}
+
+#endif // wxUSE_CLIPBOARD
+

 //-----------------------------------------------------------------------------
 // MyApp
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // MyApp
 //-----------------------------------------------------------------------------