forgot this one

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 30bb7eb986d92c1aafde8f1c4c1ce5df337cbbed..fe40a70b0bcb638098ae004942edcca3f66c9c14 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -42,6 +42,8 @@ public:
     wxBitmap  *my_horse_jpeg;
     wxBitmap  *my_horse_gif;
     wxBitmap  *my_horse_bmp;
+    wxBitmap  *my_horse_pcx;
+    wxBitmap  *my_horse_pnm;
     wxBitmap  *my_square;
     wxBitmap  *my_anti;
 
@@ -93,6 +95,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
   my_horse_jpeg = (wxBitmap*) NULL;
   my_horse_gif = (wxBitmap*) NULL;
   my_horse_bmp = (wxBitmap*) NULL;
+  my_horse_pcx = (wxBitmap*) NULL;
   my_square = (wxBitmap*) NULL;
   my_anti = (wxBitmap*) NULL;
 
@@ -126,22 +129,32 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
   else
     my_horse_png = new wxBitmap( image.ConvertToBitmap() );
   
-  if ( !image.LoadFile( dir + wxString("horse.jpg"), wxBITMAP_TYPE_JPEG ) )
+  if ( !image.LoadFile( dir + wxString("horse.jpg") ) )
       wxLogError("Can't load JPG image");
   else
       my_horse_jpeg = new wxBitmap( image.ConvertToBitmap() );
   
-  if ( !image.LoadFile( dir + wxString("horse.gif"), wxBITMAP_TYPE_GIF ) )
+  if ( !image.LoadFile( dir + wxString("horse.gif") ) )
       wxLogError("Can't load GIF image");
   else
     my_horse_gif = new wxBitmap( image.ConvertToBitmap() );
-  
+
+  if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) )
+      wxLogError("Can't load PCX image");
+  else
+    my_horse_pcx = new wxBitmap( image.ConvertToBitmap() );
+
   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 ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) )
+      wxLogError("Can't load PNM image");
+  else
+    my_horse_pnm = new wxBitmap( image.ConvertToBitmap() );
   
-  image.LoadFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG );
+  image.LoadFile( dir + wxString("test.png") );
   my_square = new wxBitmap( image.ConvertToBitmap() );
   
   CreateAntiAliasedBitmap();
@@ -149,10 +162,12 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
 MyCanvas::~MyCanvas()
 {
+  delete my_horse_pnm;
   delete my_horse_png;
   delete my_horse_jpeg;
   delete my_horse_gif;
   delete my_horse_bmp;
+  delete my_horse_pcx;
   delete my_square;
   delete my_anti;
 }
@@ -180,9 +195,15 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
   
   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, 815 );
-  if (my_horse_bmp && my_horse_bmp->Ok()) dc.DrawBitmap( *my_horse_bmp, 30, 830 );
+
+  dc.DrawText( "PCX handler", 30, 825 );
+  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()) dc.DrawBitmap( *my_horse_bmp, 30, 1070 );
+
+  dc.DrawText( "PNM handler", 30, 1285 );
+  if (my_horse_pnm && my_horse_pnm->Ok()) dc.DrawBitmap( *my_horse_pnm, 30, 1300 );
 }
 
 void MyCanvas::CreateAntiAliasedBitmap()
@@ -264,7 +285,9 @@ MyFrame::MyFrame()
   SetStatusWidths( 2, widths );
 
   m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
-  m_canvas->SetScrollbars( 10, 10, 50, 100 );
+
+  // 500 width * 1300 height
+  m_canvas->SetScrollbars( 10, 10, 50, 152 );
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
@@ -295,6 +318,8 @@ bool MyApp::OnInit()
 #endif
 
   wxImage::AddHandler( new wxGIFHandler );
+  wxImage::AddHandler( new wxPCXHandler );
+  wxImage::AddHandler( new wxPNMHandler );
 
   wxFrame *frame = new MyFrame();
   frame->Show( TRUE );