updated opengl

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 86eed4733bb7ecb13eb3daac2aa0ef0fe75e289e..625b8dc375a4cba192e8aa64762aadf5fbd42478 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -19,10 +19,13 @@
 #endif
 
 #include "wx/image.h"
 #endif
 
 #include "wx/image.h"

-

 #include "wx/file.h"
 #include "wx/file.h"

+#include "wx/mstream.h"
+#include "wx/wfstream.h"

 
 #include "smile.xbm"
 
 #include "smile.xbm"

+#include "smile.xpm"
+

 
 // derived classes
 
 
 // derived classes
 


@@ -47,10 +50,16 @@ public:
     wxBitmap  *my_horse_pcx;
     wxBitmap  *my_horse_pnm;
     wxBitmap  *my_horse_tiff;
     wxBitmap  *my_horse_pcx;
     wxBitmap  *my_horse_pnm;
     wxBitmap  *my_horse_tiff;

+    wxBitmap  *my_horse_xpm;
+    

     wxBitmap  *my_smile_xbm;
     wxBitmap  *my_square;
     wxBitmap  *my_anti;
 
     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()
 private:
     DECLARE_DYNAMIC_CLASS(MyCanvas)
     DECLARE_EVENT_TABLE()


@@ -64,6 +73,7 @@ public:
     MyFrame();
 
     void OnAbout( wxCommandEvent &event );
     MyFrame();
 
     void OnAbout( wxCommandEvent &event );

+    void OnNewFrame( wxCommandEvent &event );

     void OnQuit( wxCommandEvent &event );
 
     MyCanvas         *m_canvas;
     void OnQuit( wxCommandEvent &event );
 
     MyCanvas         *m_canvas;


@@ -73,6 +83,30 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+class MyImageFrame : public wxFrame
+{
+public:
+    MyImageFrame(wxFrame *parent, const wxBitmap& bitmap)
+        : wxFrame(parent, -1, _T("Frame with image"),
+                  wxDefaultPosition, wxDefaultSize,
+                  wxCAPTION | wxSYSTEM_MENU),
+          m_bitmap(bitmap)
+    {
+        SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());
+    }
+
+    void OnPaint(wxPaintEvent& WXUNUSED(event))
+    {
+        wxPaintDC dc( this );
+        dc.DrawBitmap( m_bitmap, 0, 0 );
+    }
+
+private:
+    wxBitmap m_bitmap;
+
+    DECLARE_EVENT_TABLE()
+};
+

 // MyApp
 
 class MyApp: public wxApp
 // MyApp
 
 class MyApp: public wxApp


@@ -89,6 +123,10 @@ IMPLEMENT_APP(MyApp)
 
 IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow)
 

+BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
+    EVT_PAINT(MyImageFrame::OnPaint)
+END_EVENT_TABLE()
+

 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
   EVT_PAINT(MyCanvas::OnPaint)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
   EVT_PAINT(MyCanvas::OnPaint)
 END_EVENT_TABLE()


@@ -96,6 +134,10 @@ END_EVENT_TABLE()
 MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
                     const wxPoint &pos, const wxSize &size )
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
 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;
 {
     my_horse_png = (wxBitmap*) NULL;
     my_horse_jpeg = (wxBitmap*) NULL;


@@ -104,6 +146,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     my_horse_pcx = (wxBitmap*) NULL;
     my_horse_pnm = (wxBitmap*) NULL;
     my_horse_tiff = (wxBitmap*) NULL;
     my_horse_pcx = (wxBitmap*) NULL;
     my_horse_pnm = (wxBitmap*) NULL;
     my_horse_tiff = (wxBitmap*) NULL;

+    my_horse_xpm = (wxBitmap*) NULL;

     my_smile_xbm = (wxBitmap*) NULL;
     my_square = (wxBitmap*) NULL;
     my_anti = (wxBitmap*) NULL;
     my_smile_xbm = (wxBitmap*) NULL;
     my_square = (wxBitmap*) NULL;
     my_anti = (wxBitmap*) NULL;


@@ -115,8 +158,10 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     wxMemoryDC dc;
     dc.SelectObject( bitmap );
     dc.SetBrush( wxBrush( "orange", wxSOLID ) );
     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.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
     dc.SelectObject( wxNullBitmap );
 
     // try to find the directory with our images


@@ -128,61 +173,99 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     else
         wxLogWarning("Can't find image files in either '.' or '..'!");
 
     else
         wxLogWarning("Can't find image files in either '.' or '..'!");
 

-    wxImage image( bitmap );
+    wxImage image = bitmap.ConvertToImage();

 
 

-    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");
 
         wxLogError("Can't save file");
 

-    if ( !image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG ) )
+    image.Destroy();
+
+    image.LoadFile( dir + wxString("test.png") );
+    my_square = new wxBitmap( image );
+
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + wxString("horse.png")) )

         wxLogError("Can't load PNG image");
     else
         wxLogError("Can't load PNG image");
     else

-        my_horse_png = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_png = new wxBitmap( image );
+#endif // wxUSE_LIBPNG
+
+#if wxUSE_LIBJPEG
+    image.Destroy();

 
 

-    if ( !image.LoadFile( dir + wxString("horse.jpg") ) )
+    if ( !image.LoadFile( dir + wxString("horse.jpg")) )

         wxLogError("Can't load JPG image");
     else
         wxLogError("Can't load JPG image");
     else

-        my_horse_jpeg = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_jpeg = new wxBitmap( image );
+#endif // wxUSE_LIBJPEG

 
 #if wxUSE_GIF
 
 #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
         wxLogError("Can't load GIF image");
     else

-        my_horse_gif = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_gif = new wxBitmap( image );

 #endif
 
 #if wxUSE_PCX
 #endif
 
 #if wxUSE_PCX

+    image.Destroy();
+

     if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) )
         wxLogError("Can't load PCX image");
     else
     if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) )
         wxLogError("Can't load PCX image");
     else

-        my_horse_pcx = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_pcx = new wxBitmap( image );

 #endif
 
 #endif
 

+    image.Destroy();
+

     if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) )
         wxLogError("Can't load BMP image");
     else
     if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) )
         wxLogError("Can't load BMP image");
     else

-        my_horse_bmp = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_bmp = new wxBitmap( image );
+
+#if wxUSE_XPM
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + wxString("horse.xpm"), wxBITMAP_TYPE_XPM ) )
+        wxLogError("Can't load XPM image");
+    else
+        my_horse_xpm = new wxBitmap( image );
+
+    if ( !image.SaveFile( dir + wxString("test.xpm"), wxBITMAP_TYPE_XPM ))
+        wxLogError("Can't save file");
+#endif

 
 #if wxUSE_PNM
 
 #if wxUSE_PNM

+    image.Destroy();
+

     if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) )
         wxLogError("Can't load PNM image");
     else
     if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) )
         wxLogError("Can't load PNM image");
     else

-        my_horse_pnm = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_pnm = new wxBitmap( image );

 #endif
 
 #if wxUSE_LIBTIFF
 #endif
 
 #if wxUSE_LIBTIFF

+    image.Destroy();
+

     if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) )
         wxLogError("Can't load TIFF image");
     else
     if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) )
         wxLogError("Can't load TIFF image");
     else

-        my_horse_tiff = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_tiff = new wxBitmap( image );

 #endif
 
 #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 );
     CreateAntiAliasedBitmap();
 
     my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width,
                                  smile_height, 1 );

+
+#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

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


@@ -194,6 +277,7 @@ MyCanvas::~MyCanvas()
     delete my_horse_bmp;
     delete my_horse_pcx;
     delete my_horse_tiff;
     delete my_horse_bmp;
     delete my_horse_pcx;
     delete my_horse_tiff;

+    delete my_horse_xpm;

     delete my_smile_xbm;
     delete my_square;
     delete my_anti;
     delete my_smile_xbm;
     delete my_square;
     delete my_anti;


@@ -209,15 +293,17 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     dc.DrawText( "Drawn directly", 150, 10 );
     dc.SetBrush( wxBrush( "orange", wxSOLID ) );
 
     dc.DrawText( "Drawn directly", 150, 10 );
     dc.SetBrush( wxBrush( "orange", wxSOLID ) );

-    dc.SetPen( *wxWHITE_PEN );
+    dc.SetPen( *wxBLACK_PEN );

     dc.DrawRectangle( 150, 30, 100, 100 );
     dc.DrawRectangle( 150, 30, 100, 100 );

+    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_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.DrawBitmap( *my_horse_png, 30, 150 );
         wxRect rect(0,0,100,100);
         wxBitmap sub( my_horse_png->GetSubBitmap(rect) );


@@ -226,71 +312,102 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     }
 
     dc.DrawText( "JPEG handler", 30, 365 );
     }
 
     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 );
         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 );
         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 );
         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 );
         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.DrawBitmap( *my_horse_pnm, 30, 1300 );

-  
+

     dc.DrawText( "TIFF handler", 30, 1515 );
     dc.DrawText( "TIFF handler", 30, 1515 );

-    if (my_horse_tiff && my_horse_tiff->Ok()) 
-        dc.DrawBitmap( *my_horse_pnm, 30, 1530 );
+    if (my_horse_tiff && my_horse_tiff->Ok())
+        dc.DrawBitmap( *my_horse_tiff, 30, 1530 );

 
 

-    if (my_smile_xbm && my_smile_xbm->Ok()) 
+    dc.DrawText( "XPM handler", 30, 1745 );
+    if (my_horse_xpm && my_horse_xpm->Ok())
+        dc.DrawBitmap( *my_horse_xpm, 30, 1760 );
+
+    if (my_smile_xbm && my_smile_xbm->Ok())

     {
     {

-        dc.DrawText( "XBM bitmap", 30, 1745 );
+        dc.DrawText( "XBM bitmap", 30, 1975 );
+        dc.DrawText( "(green on red)", 30, 1990 );
+        dc.SetTextForeground( "GREEN" );
+        dc.SetTextBackground( "RED" );
+        dc.DrawBitmap( *my_smile_xbm, 30, 2010 );
+
+        dc.SetTextForeground( "BLACK" );
+        dc.DrawText( "After wxImage conversion", 150, 1975 );
+        dc.DrawText( "(red on white)", 150, 1990 );

         dc.SetTextForeground( "RED" );
         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, 
+        wxImage i = my_smile_xbm->ConvertToImage();
+        i.SetMaskColour( 255, 255, 255 );
+        i.Replace( 0, 0, 0,

                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );

-        dc.DrawBitmap( i.ConvertToBitmap(), 150, 1760, TRUE );
+        dc.DrawBitmap( i.ConvertToBitmap(), 150, 2010, TRUE );
+        dc.SetTextForeground( "BLACK" );

     }
     }

-    dc.SetTextForeground( "BLACK" );
-    
-    wxBitmap mono( 30,30,1 );
+
+
+    wxBitmap mono( 60,50,1 );

     wxMemoryDC memdc;
     memdc.SelectObject( mono );
     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.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 );
     memdc.SelectObject( wxNullBitmap );

-    if (mono.Ok()) 
+
+    if (mono.Ok())

     {
     {

-        dc.DrawText( "Mono bitmap", 30, 1845 );
+        dc.DrawText( "Mono bitmap", 30, 2095 );
+        dc.DrawText( "(red on green)", 30, 2110 );

         dc.SetTextForeground( "RED" );
         dc.SetTextBackground( "GREEN" );
         dc.SetTextForeground( "RED" );
         dc.SetTextBackground( "GREEN" );

-        dc.DrawBitmap( mono, 30, 1860 );
-       
-        dc.DrawText( "After wxImage conversion", 150, 1845 );
-        wxImage i( mono );
-           i.SetMaskColour( 0,0,0 );
-           i.Replace( 255,255,255, 
+        dc.DrawBitmap( mono, 30, 2130 );
+
+        dc.SetTextForeground( "BLACK" );
+        dc.DrawText( "After wxImage conversion", 150, 2095 );
+        dc.DrawText( "(red on white)", 150, 2110 );
+        dc.SetTextForeground( "RED" );
+        wxImage i = mono.ConvertToImage();
+        i.SetMaskColour( 255,255,255 );
+        i.Replace( 0,0,0,

                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );

-        dc.DrawBitmap( i.ConvertToBitmap(), 150, 1860, TRUE );
+        dc.DrawBitmap( i.ConvertToBitmap(), 150, 2130, TRUE );
+        dc.SetTextForeground( "BLACK" );
+    }
+
+    dc.DrawText("XPM bitmap", 30, 2230);
+    if ( m_bmpSmileXpm.Ok() )
+    {
+        dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE);
+    }
+
+    dc.DrawText("XPM icon", 150, 2230);
+    if ( m_iconSmileXpm.Ok() )
+    {
+        dc.DrawIcon(m_iconSmileXpm, 150, 2250);

     }
 }
 
     }
 }
 


@@ -313,7 +430,7 @@ void MyCanvas::CreateAntiAliasedBitmap()
   dc.SetPen( *wxTRANSPARENT_PEN );
   dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 );
 
   dc.SetPen( *wxTRANSPARENT_PEN );
   dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 );
 

-  wxImage original( bitmap );
+  wxImage original= bitmap.ConvertToImage();

   wxImage anti( 150, 150 );
 
   /* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */
   wxImage anti( 150, 150 );
 
   /* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */


@@ -347,12 +464,14 @@ void MyCanvas::CreateAntiAliasedBitmap()
 
 const int ID_QUIT  = 108;
 const int ID_ABOUT = 109;
 
 const int ID_QUIT  = 108;
 const int ID_ABOUT = 109;

+const int ID_NEW = 110;

 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 
 BEGIN_EVENT_TABLE(MyFrame,wxFrame)
   EVT_MENU    (ID_ABOUT, MyFrame::OnAbout)
   EVT_MENU    (ID_QUIT,  MyFrame::OnQuit)
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 
 BEGIN_EVENT_TABLE(MyFrame,wxFrame)
   EVT_MENU    (ID_ABOUT, MyFrame::OnAbout)
   EVT_MENU    (ID_QUIT,  MyFrame::OnQuit)

+  EVT_MENU    (ID_NEW,  MyFrame::OnNewFrame)

 END_EVENT_TABLE()
 
 MyFrame::MyFrame()
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()


@@ -360,7 +479,10 @@ MyFrame::MyFrame()
                   wxPoint(20,20), wxSize(470,360) )
 {
   wxMenu *file_menu = new wxMenu();
                   wxPoint(20,20), wxSize(470,360) )
 {
   wxMenu *file_menu = new wxMenu();

-  file_menu->Append( ID_ABOUT, "&About..");
+  file_menu->Append( ID_NEW, "&Show image...");
+  file_menu->AppendSeparator();
+  file_menu->Append( ID_ABOUT, "&About...");
+  file_menu->AppendSeparator();

   file_menu->Append( ID_QUIT, "E&xit");
 
   wxMenuBar *menu_bar = new wxMenuBar();
   file_menu->Append( ID_QUIT, "E&xit");
 
   wxMenuBar *menu_bar = new wxMenuBar();


@@ -374,8 +496,8 @@ MyFrame::MyFrame()
 
   m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
 
 
   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) )
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )


@@ -386,11 +508,27 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
 void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 {
   (void)wxMessageBox( "wxImage demo\n"
 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 );
 }
 
                       "About wxImage Demo", wxICON_INFORMATION | wxOK );
 }
 

+void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
+{
+    wxString filename = wxFileSelector(_T("Select image file"));
+    if ( !filename )
+        return;
+
+    wxImage image;
+    if ( !image.LoadFile(filename) )
+    {
+        wxLogError(_T("Couldn't load image from '%s'."), filename.c_str());
+
+        return;
+    }
+
+    (new MyImageFrame(this, image.ConvertToBitmap()))->Show();
+}
+

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


@@ -421,6 +559,10 @@ bool MyApp::OnInit()
   wxImage::AddHandler( new wxPNMHandler );
 #endif
 
   wxImage::AddHandler( new wxPNMHandler );
 #endif
 

+#if wxUSE_XPM
+  wxImage::AddHandler( new wxXPMHandler );
+#endif
+

   wxFrame *frame = new MyFrame();
   frame->Show( TRUE );
 
   wxFrame *frame = new MyFrame();
   frame->Show( TRUE );