X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60a41aee696ccb7e4ffdd0433d74c930e7b00afd..47c13eb766e12deeed992f46f0632c5edb6475fe:/samples/image/image.cpp

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 0fc51e19b1..b55dcc9eb1 100644
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -22,6 +22,9 @@
 
 #include "wx/file.h"
 
+#include "smile.xbm"
+#include "smile.xpm"
+
 // derived classes
 
 class MyFrame;
@@ -45,9 +48,14 @@ public:
     wxBitmap  *my_horse_pcx;
     wxBitmap  *my_horse_pnm;
     wxBitmap  *my_horse_tiff;
+    wxBitmap  *my_smile_xbm;
     wxBitmap  *my_square;
     wxBitmap  *my_anti;
 
+protected:
+    wxBitmap m_bmpSmileXpm;
+    wxIcon   m_iconSmileXpm;
+
 private:
     DECLARE_DYNAMIC_CLASS(MyCanvas)
     DECLARE_EVENT_TABLE()
@@ -92,7 +100,9 @@ END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
                     const wxPoint &pos, const wxSize &size )
-        : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
+        : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER ),
+          m_bmpSmileXpm((const char **) smile_xpm),
+          m_iconSmileXpm((const char **) smile_xpm)
 {
     my_horse_png = (wxBitmap*) NULL;
     my_horse_jpeg = (wxBitmap*) NULL;
@@ -101,6 +111,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     my_horse_pcx = (wxBitmap*) NULL;
     my_horse_pnm = (wxBitmap*) NULL;
     my_horse_tiff = (wxBitmap*) NULL;
+    my_smile_xbm = (wxBitmap*) NULL;
     my_square = (wxBitmap*) NULL;
     my_anti = (wxBitmap*) NULL;
 
@@ -111,14 +122,16 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     wxMemoryDC dc;
     dc.SelectObject( bitmap );
     dc.SetBrush( wxBrush( "orange", wxSOLID ) );
-    dc.SetPen( *wxWHITE_PEN );
+    dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 0, 0, 100, 100 );
+    dc.SetBrush( *wxWHITE_BRUSH );
+    dc.DrawRectangle( 20, 20, 60, 60 );
     dc.SelectObject( wxNullBitmap );
 
     // try to find the directory with our images
     wxString dir;
     if ( wxFile::Exists("./horse.png") )
-        dir = "./";
+        dir = "./";          
     else if ( wxFile::Exists("../horse.png") )
         dir = "../";
     else
@@ -126,6 +139,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     wxImage image( bitmap );
 
+#if wxUSE_LIBPNG
     if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ) )
         wxLogError("Can't save file");
 
@@ -133,11 +147,14 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
         wxLogError("Can't load PNG image");
     else
         my_horse_png = new wxBitmap( image.ConvertToBitmap() );
+#endif // wxUSE_LIBPNG
 
+#if wxUSE_LIBJPEG
     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") ) )
@@ -172,10 +189,17 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
         my_horse_tiff = new wxBitmap( image.ConvertToBitmap() );
 #endif
 
-    image.LoadFile( dir + wxString("test.png") );
+    image.LoadFile( dir + wxString("test.pcx") );
     my_square = new wxBitmap( image.ConvertToBitmap() );
 
     CreateAntiAliasedBitmap();
+
+    my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width,
+                                 smile_height, 1 );
+
+    // demonstrates XPM automatically using the mask when saving
+    if ( m_bmpSmileXpm.Ok() )
+        m_bmpSmileXpm.SaveFile("saved.xpm", wxBITMAP_TYPE_XPM);
 }
 
 MyCanvas::~MyCanvas()
@@ -187,45 +211,125 @@ MyCanvas::~MyCanvas()
     delete my_horse_bmp;
     delete my_horse_pcx;
     delete my_horse_tiff;
+    delete my_smile_xbm;
     delete my_square;
     delete my_anti;
 }
 
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
-  wxPaintDC dc( this );
-  PrepareDC( dc );
+    wxPaintDC dc( this );
+    PrepareDC( dc );
 
-  dc.DrawText( "Loaded image", 30, 10 );
-  if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 );
+    dc.DrawText( "Loaded image", 30, 10 );
+    if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 );
 
-  dc.DrawText( "Drawn directly", 150, 10 );
-  dc.SetBrush( wxBrush( "orange", wxSOLID ) );
-  dc.SetPen( *wxWHITE_PEN );
-  dc.DrawRectangle( 150, 30, 100, 100 );
+    dc.DrawText( "Drawn directly", 150, 10 );
+    dc.SetBrush( wxBrush( "orange", wxSOLID ) );
+    dc.SetPen( *wxBLACK_PEN );
+    dc.DrawRectangle( 150, 30, 100, 100 );
+    dc.SetBrush( *wxWHITE_BRUSH );
+    dc.DrawRectangle( 170, 50, 60, 60 );
+
+    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) );
+        dc.DrawText( "GetSubBitmap()", 280, 190 );
+        dc.DrawBitmap( sub, 280, 210 );
+    }
 
-  if (my_anti && my_anti->Ok()) dc.DrawBitmap( *my_anti, 250, 140 );
+    dc.DrawText( "JPEG handler", 30, 365 );
+    if (my_horse_jpeg && my_horse_jpeg->Ok())
+        dc.DrawBitmap( *my_horse_jpeg, 30, 380 );
 
-  dc.DrawText( "PNG handler", 30, 135 );
-  if (my_horse_png && my_horse_png->Ok()) dc.DrawBitmap( *my_horse_png, 30, 150 );
+    dc.DrawText( "GIF handler", 30, 595 );
+    if (my_horse_gif && my_horse_gif->Ok())
+        dc.DrawBitmap( *my_horse_gif, 30, 610 );
 
-  dc.DrawText( "JPEG handler", 30, 365 );
-  if (my_horse_jpeg && my_horse_jpeg->Ok()) dc.DrawBitmap( *my_horse_jpeg, 30, 380 );
+    dc.DrawText( "PCX handler", 30, 825 );
+    if (my_horse_pcx && my_horse_pcx->Ok())
+        dc.DrawBitmap( *my_horse_pcx, 30, 840 );
 
-  dc.DrawText( "GIF handler", 30, 595 );
-  if (my_horse_gif && my_horse_gif->Ok()) dc.DrawBitmap( *my_horse_gif, 30, 610 );
+    dc.DrawText( "BMP handler", 30, 1055 );
+    if (my_horse_bmp && my_horse_bmp->Ok())
+        dc.DrawBitmap( *my_horse_bmp, 30, 1070 );
 
-  dc.DrawText( "PCX handler", 30, 825 );
-  if (my_horse_pcx && my_horse_pcx->Ok()) dc.DrawBitmap( *my_horse_pcx, 30, 840 );
+    dc.DrawText( "PNM handler", 30, 1285 );
+    if (my_horse_pnm && my_horse_pnm->Ok())
+        dc.DrawBitmap( *my_horse_pnm, 30, 1300 );
 
-  dc.DrawText( "BMP handler", 30, 1055 );
-  if (my_horse_bmp && my_horse_bmp->Ok()) dc.DrawBitmap( *my_horse_bmp, 30, 1070 );
+    dc.DrawText( "TIFF handler", 30, 1515 );
+    if (my_horse_tiff && my_horse_tiff->Ok())
+        dc.DrawBitmap( *my_horse_tiff, 30, 1530 );
 
-  dc.DrawText( "PNM handler", 30, 1285 );
-  if (my_horse_pnm && my_horse_pnm->Ok()) dc.DrawBitmap( *my_horse_pnm, 30, 1300 );
-  
-  dc.DrawText( "TIFF handler", 30, 1415 );
-  if (my_horse_tiff && my_horse_tiff->Ok()) dc.DrawBitmap( *my_horse_pnm, 30, 1430 );
+    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( "After wxImage conversion", 150, 1745 );
+        wxImage i( *my_smile_xbm );
+        i.SetMaskColour( 0,0,0 );
+        i.Replace( 255,255,255,
+               wxRED_PEN->GetColour().Red(),
+               wxRED_PEN->GetColour().Green(),
+               wxRED_PEN->GetColour().Blue() );
+        dc.DrawBitmap( i.ConvertToBitmap(), 150, 1760, TRUE );
+    }
+    dc.SetTextForeground( "BLACK" );
+
+    wxBitmap mono( 60,50,1 );
+    wxMemoryDC memdc;
+    memdc.SelectObject( mono );
+    memdc.SetPen( *wxBLACK_PEN );
+    memdc.SetBrush( *wxWHITE_BRUSH );
+    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())
+    {
+        dc.DrawText( "Mono bitmap", 30, 1845 );
+        dc.SetTextForeground( "RED" );
+        dc.SetTextBackground( "GREEN" );
+        dc.DrawBitmap( mono, 30, 1860 );
+
+        dc.SetTextForeground( "BLACK" );
+        dc.DrawText( "After wxImage conversion", 150, 1845 );
+        dc.SetTextForeground( "RED" );
+        wxImage i( mono );
+        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.SetTextForeground( "BLACK" );
+    }
+
+    dc.DrawText("XPM bitmap", 30, 1950);
+    if ( m_bmpSmileXpm.Ok() )
+    {
+        dc.DrawBitmap(m_bmpSmileXpm, 30, 1975, TRUE);
+    }
+
+    dc.DrawText("XPM icon", 150, 1950);
+    if ( m_iconSmileXpm.Ok() )
+    {
+        dc.DrawIcon(m_iconSmileXpm, 150, 1975);
+    }
 }
 
 void MyCanvas::CreateAntiAliasedBitmap()
@@ -308,8 +412,8 @@ MyFrame::MyFrame()
 
   m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
 
-  // 500 width * 1300 height
-  m_canvas->SetScrollbars( 10, 10, 50, 180 );
+  // 500 width * 2100 height
+  m_canvas->SetScrollbars( 10, 10, 50, 210 );
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
@@ -320,8 +424,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 );
 }