wxFileSelector should have file name only, not path, passed to 3rd arg

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index a0a7f0e5c87ea2c78b653364a840fb3a5d793729..55b68053fffa5decbfbb5cffcffbf6f8c2e55632 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -19,7 +19,6 @@
 #endif
 
 #include "wx/image.h"
-
 #include "wx/file.h"
 
 #include "smile.xbm"
@@ -69,6 +68,7 @@ public:
     MyFrame();
 
     void OnAbout( wxCommandEvent &event );
+    void OnNewFrame( wxCommandEvent &event );
     void OnQuit( wxCommandEvent &event );
 
     MyCanvas         *m_canvas;
@@ -78,6 +78,30 @@ private:
     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
@@ -94,6 +118,10 @@ IMPLEMENT_APP(MyApp)
 
 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()
@@ -142,42 +170,42 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     wxImage image( bitmap );
 
 #if wxUSE_LIBPNG
-    if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ) )
+    if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ))
         wxLogError("Can't save file");
-        
-    image = wxImage( 100, 100 );
+
+    image.Destroy();
 
     image.LoadFile( dir + wxString("test.png") );
     my_square = new wxBitmap( image.ConvertToBitmap() );
-    
-    image = wxImage( 100, 100 );
 
-    if ( !image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG ) )
+    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 wxUSE_LIBJPEG
-    image = wxImage( 100, 100 );
+    image.Destroy();
 
-    if ( !image.LoadFile( dir + wxString("horse.jpg") ) )
+    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
-    image = wxImage( 100, 100 );
+    image.Destroy();
 
-    if ( !image.LoadFile( dir + wxString("horse.gif") ) )
+    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 = wxImage( 100, 100 );
+    image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) )
         wxLogError("Can't load PCX image");
@@ -185,7 +213,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
         my_horse_pcx = new wxBitmap( image.ConvertToBitmap() );
 #endif
 
-    image = wxImage( 100, 100 );
+    image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) )
         wxLogError("Can't load BMP image");
@@ -193,7 +221,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
         my_horse_bmp = new wxBitmap( image.ConvertToBitmap() );
 
 #if wxUSE_PNM
-    image = wxImage( 100, 100 );
+    image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) )
         wxLogError("Can't load PNM image");
@@ -202,7 +230,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 #endif
 
 #if wxUSE_LIBTIFF
-    image = wxImage( 100, 100 );
+    image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) )
         wxLogError("Can't load TIFF image");
@@ -293,20 +321,25 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     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( 60,50,1 );
     wxMemoryDC memdc;
@@ -321,15 +354,18 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     memdc.SetPen( *wxRED_PEN );
     memdc.DrawLine( 5, 42, 50, 42 );
     memdc.SelectObject( wxNullBitmap );
+
     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.DrawBitmap( mono, 30, 1900 );
 
         dc.SetTextForeground( "BLACK" );
-        dc.DrawText( "After wxImage conversion", 150, 1845 );
+        dc.DrawText( "After wxImage conversion", 150, 1865 );
+        dc.DrawText( "(red on white)", 150, 1880 );
         dc.SetTextForeground( "RED" );
         wxImage i( mono );
         i.SetMaskColour( 255,255,255 );
@@ -337,20 +373,20 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
                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, 1950);
+    dc.DrawText("XPM bitmap", 30, 2000);
     if ( m_bmpSmileXpm.Ok() )
     {
-        dc.DrawBitmap(m_bmpSmileXpm, 30, 1975, TRUE);
+        dc.DrawBitmap(m_bmpSmileXpm, 30, 2020, TRUE);
     }
 
-    dc.DrawText("XPM icon", 150, 1950);
+    dc.DrawText("XPM icon", 150, 2000);
     if ( m_iconSmileXpm.Ok() )
     {
-        dc.DrawIcon(m_iconSmileXpm, 150, 1975);
+        dc.DrawIcon(m_iconSmileXpm, 150, 2020);
     }
 }
 
@@ -407,12 +443,14 @@ void MyCanvas::CreateAntiAliasedBitmap()
 
 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)
+  EVT_MENU    (ID_NEW,  MyFrame::OnNewFrame)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()
@@ -420,7 +458,10 @@ MyFrame::MyFrame()
                   wxPoint(20,20), wxSize(470,360) )
 {
   wxMenu *file_menu = new wxMenu();
+  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();
@@ -435,7 +476,7 @@ MyFrame::MyFrame()
   m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
 
   // 500 width * 2100 height
-  m_canvas->SetScrollbars( 10, 10, 50, 210 );
+  m_canvas->SetScrollbars( 10, 10, 50, 220 );
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
@@ -450,6 +491,23 @@ void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
                       "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
 //-----------------------------------------------------------------------------