X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf3da716f65a419cddc25bdb70ccd7cbe4a3afa7..043d16b2256f509cf8aa7bd8d7b05c84bb117084:/samples/image/image.cpp

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 1e683274ad..3db24946fa 100644
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -19,10 +19,10 @@
 #endif
 
 #include "wx/image.h"
-
 #include "wx/file.h"
 
 #include "smile.xbm"
+#include "smile.xpm"
 
 // derived classes
 
@@ -51,6 +51,10 @@ public:
     wxBitmap  *my_square;
     wxBitmap  *my_anti;
 
+protected:
+    wxBitmap m_bmpSmileXpm;
+    wxIcon   m_iconSmileXpm;
+
 private:
     DECLARE_DYNAMIC_CLASS(MyCanvas)
     DECLARE_EVENT_TABLE()
@@ -96,6 +100,10 @@ END_EVENT_TABLE()
 MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
                     const wxPoint &pos, const wxSize &size )
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
+#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
+          , m_bmpSmileXpm((const char **) smile_xpm)
+          , m_iconSmileXpm((const char **) smile_xpm)
+#endif
 {
     my_horse_png = (wxBitmap*) NULL;
     my_horse_jpeg = (wxBitmap*) NULL;
@@ -132,39 +140,60 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     wxImage image( bitmap );
 
-    if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ) )
+#if wxUSE_LIBPNG
+    if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ))
         wxLogError("Can't save file");
+        
+    image.Destroy();
 
-    if ( !image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG ) )
+    image.LoadFile( dir + wxString("test.png") );
+    my_square = new wxBitmap( image.ConvertToBitmap() );
+    
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + wxString("horse.png")) )
         wxLogError("Can't load PNG image");
     else
         my_horse_png = new wxBitmap( image.ConvertToBitmap() );
+#endif // wxUSE_LIBPNG
 
-    if ( !image.LoadFile( dir + wxString("horse.jpg") ) )
+#if wxUSE_LIBJPEG
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + wxString("horse.jpg")) )
         wxLogError("Can't load JPG image");
     else
         my_horse_jpeg = new wxBitmap( image.ConvertToBitmap() );
+#endif // wxUSE_LIBJPEG
 
 #if wxUSE_GIF
-    if ( !image.LoadFile( dir + wxString("horse.gif") ) )
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + wxString("horse.gif")) )
         wxLogError("Can't load GIF image");
     else
         my_horse_gif = new wxBitmap( image.ConvertToBitmap() );
 #endif
 
 #if wxUSE_PCX
+    image.Destroy();
+
     if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) )
         wxLogError("Can't load PCX image");
     else
         my_horse_pcx = new wxBitmap( image.ConvertToBitmap() );
 #endif
 
+    image.Destroy();
+
     if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) )
         wxLogError("Can't load BMP image");
     else
         my_horse_bmp = new wxBitmap( image.ConvertToBitmap() );
 
 #if wxUSE_PNM
+    image.Destroy();
+
     if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) )
         wxLogError("Can't load PNM image");
     else
@@ -172,19 +201,26 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 #endif
 
 #if wxUSE_LIBTIFF
+    image.Destroy();
+
     if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) )
         wxLogError("Can't load TIFF image");
     else
         my_horse_tiff = new wxBitmap( image.ConvertToBitmap() );
 #endif
 
-    image.LoadFile( dir + wxString("test.png") );
-    my_square = new wxBitmap( image.ConvertToBitmap() );
-
     CreateAntiAliasedBitmap();
 
     my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width,
                                  smile_height, 1 );
+
+#ifndef __WXGTK__
+#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
+    // demonstrates XPM automatically using the mask when saving
+    if ( m_bmpSmileXpm.Ok() )
+        m_bmpSmileXpm.SaveFile("saved.xpm", wxBITMAP_TYPE_XPM);
+#endif
+#endif
 }
 
 MyCanvas::~MyCanvas()
@@ -216,12 +252,12 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     dc.SetBrush( *wxWHITE_BRUSH );
     dc.DrawRectangle( 170, 50, 60, 60 );
 
-    if (my_anti && my_anti->Ok()) 
+    if (my_anti && my_anti->Ok())
         dc.DrawBitmap( *my_anti, 280, 30 );
 
     dc.DrawText( "PNG handler", 30, 135 );
     if (my_horse_png && my_horse_png->Ok())
-    { 
+    {
         dc.DrawBitmap( *my_horse_png, 30, 150 );
         wxRect rect(0,0,100,100);
         wxBitmap sub( my_horse_png->GetSubBitmap(rect) );
@@ -230,71 +266,98 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     }
 
     dc.DrawText( "JPEG handler", 30, 365 );
-    if (my_horse_jpeg && my_horse_jpeg->Ok()) 
+    if (my_horse_jpeg && my_horse_jpeg->Ok())
         dc.DrawBitmap( *my_horse_jpeg, 30, 380 );
 
     dc.DrawText( "GIF handler", 30, 595 );
-    if (my_horse_gif && my_horse_gif->Ok()) 
+    if (my_horse_gif && my_horse_gif->Ok())
         dc.DrawBitmap( *my_horse_gif, 30, 610 );
 
     dc.DrawText( "PCX handler", 30, 825 );
-    if (my_horse_pcx && my_horse_pcx->Ok()) 
+    if (my_horse_pcx && my_horse_pcx->Ok())
         dc.DrawBitmap( *my_horse_pcx, 30, 840 );
 
     dc.DrawText( "BMP handler", 30, 1055 );
-    if (my_horse_bmp && my_horse_bmp->Ok()) 
+    if (my_horse_bmp && my_horse_bmp->Ok())
         dc.DrawBitmap( *my_horse_bmp, 30, 1070 );
 
     dc.DrawText( "PNM handler", 30, 1285 );
-    if (my_horse_pnm && my_horse_pnm->Ok()) 
+    if (my_horse_pnm && my_horse_pnm->Ok())
         dc.DrawBitmap( *my_horse_pnm, 30, 1300 );
-  
+
     dc.DrawText( "TIFF handler", 30, 1515 );
-    if (my_horse_tiff && my_horse_tiff->Ok()) 
+    if (my_horse_tiff && my_horse_tiff->Ok())
         dc.DrawBitmap( *my_horse_tiff, 30, 1530 );
 
-    if (my_smile_xbm && my_smile_xbm->Ok()) 
+    if (my_smile_xbm && my_smile_xbm->Ok())
     {
         dc.DrawText( "XBM bitmap", 30, 1745 );
-        dc.SetTextForeground( "RED" );
-        dc.SetTextBackground( "GREEN" );
-        dc.DrawBitmap( *my_smile_xbm, 30, 1760 );
-	
+        dc.DrawText( "(green on red)", 30, 1760 );
+        dc.SetTextForeground( "GREEN" );
+        dc.SetTextBackground( "RED" );
+        dc.DrawBitmap( *my_smile_xbm, 30, 1780 );
+
+        dc.SetTextForeground( "BLACK" );
         dc.DrawText( "After wxImage conversion", 150, 1745 );
+        dc.DrawText( "(red on white)", 150, 1760 );
+        dc.SetTextForeground( "RED" );
         wxImage i( *my_smile_xbm );
-	    i.SetMaskColour( 0,0,0 );
-	    i.Replace( 255,255,255, 
+        i.SetMaskColour( 255, 255, 255 );
+        i.Replace( 0, 0, 0,
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
-        dc.DrawBitmap( i.ConvertToBitmap(), 150, 1760, TRUE );
+        dc.DrawBitmap( i.ConvertToBitmap(), 150, 1780, TRUE );
+        dc.SetTextForeground( "BLACK" );
     }
-    dc.SetTextForeground( "BLACK" );
-    
-    wxBitmap mono( 30,30,1 );
+
+
+    wxBitmap mono( 60,50,1 );
     wxMemoryDC memdc;
     memdc.SelectObject( mono );
-    memdc.SetPen( *wxTRANSPARENT_PEN );
-    memdc.SetBrush( *wxBLACK_BRUSH );
-    memdc.DrawRectangle( 0,0,30,30 );
+    memdc.SetPen( *wxBLACK_PEN );
     memdc.SetBrush( *wxWHITE_BRUSH );
-    memdc.DrawRectangle( 5,5,20,20 );
+    memdc.DrawRectangle( 0,0,60,50 );
+    memdc.SetTextForeground( *wxBLACK );
+    memdc.DrawText( "Hi!", 5, 5 );
+    memdc.SetBrush( *wxBLACK_BRUSH );
+    memdc.DrawRectangle( 33,5,20,20 );
+    memdc.SetPen( *wxRED_PEN );
+    memdc.DrawLine( 5, 42, 50, 42 );
     memdc.SelectObject( wxNullBitmap );
-    if (mono.Ok()) 
+
+    if (mono.Ok())
     {
-        dc.DrawText( "Mono bitmap", 30, 1845 );
+        dc.DrawText( "Mono bitmap", 30, 1865 );
+        dc.DrawText( "(red on green)", 30, 1880 );
         dc.SetTextForeground( "RED" );
         dc.SetTextBackground( "GREEN" );
-        dc.DrawBitmap( mono, 30, 1860 );
-	
-        dc.DrawText( "After wxImage conversion", 150, 1845 );
+        dc.DrawBitmap( mono, 30, 1900 );
+
+        dc.SetTextForeground( "BLACK" );
+        dc.DrawText( "After wxImage conversion", 150, 1865 );
+        dc.DrawText( "(red on white)", 150, 1880 );
+        dc.SetTextForeground( "RED" );
         wxImage i( mono );
-	    i.SetMaskColour( 0,0,0 );
-	    i.Replace( 255,255,255, 
+        i.SetMaskColour( 255,255,255 );
+        i.Replace( 0,0,0,
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
-        dc.DrawBitmap( i.ConvertToBitmap(), 150, 1860, TRUE );
+        dc.DrawBitmap( i.ConvertToBitmap(), 150, 1900, TRUE );
+        dc.SetTextForeground( "BLACK" );
+    }
+
+    dc.DrawText("XPM bitmap", 30, 2000);
+    if ( m_bmpSmileXpm.Ok() )
+    {
+        dc.DrawBitmap(m_bmpSmileXpm, 30, 2020, TRUE);
+    }
+
+    dc.DrawText("XPM icon", 150, 2000);
+    if ( m_iconSmileXpm.Ok() )
+    {
+        dc.DrawIcon(m_iconSmileXpm, 150, 2020);
     }
 }
 
@@ -364,7 +427,7 @@ MyFrame::MyFrame()
                   wxPoint(20,20), wxSize(470,360) )
 {
   wxMenu *file_menu = new wxMenu();
-  file_menu->Append( ID_ABOUT, "&About..");
+  file_menu->Append( ID_ABOUT, "&About...");
   file_menu->Append( ID_QUIT, "E&xit");
 
   wxMenuBar *menu_bar = new wxMenuBar();
@@ -378,8 +441,8 @@ MyFrame::MyFrame()
 
   m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
 
-  // 500 width * 1900 height
-  m_canvas->SetScrollbars( 10, 10, 50, 200 );
+  // 500 width * 2100 height
+  m_canvas->SetScrollbars( 10, 10, 50, 220 );
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
@@ -390,8 +453,7 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
 void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 {
   (void)wxMessageBox( "wxImage demo\n"
-                      "\n"
-                      "Robert Roebling (c) 1998",
+                      "Robert Roebling (c) 1998,2000",
                       "About wxImage Demo", wxICON_INFORMATION | wxOK );
 }