*** empty log message ***

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index c13b9f3d8516dd7f359a03431e9c13f90eec84fa..d0d48d451d329ab023ac71db7e724e6503da9a28 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -41,6 +41,8 @@ public:
     wxBitmap  *my_horse_png;
     wxBitmap  *my_horse_jpeg;
     wxBitmap  *my_horse_gif;
+    wxBitmap  *my_horse_bmp;
+    wxBitmap  *my_horse_pcx;
     wxBitmap  *my_square;
     wxBitmap  *my_anti;
 
@@ -91,6 +93,8 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
   my_horse_png = (wxBitmap*) NULL;
   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;
 
@@ -115,6 +119,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
       wxLogWarning("Can't find image files in either '.' or '..'!");
 
   wxImage image( bitmap );
+  
   if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ) )
       wxLogError("Can't save file");
   
@@ -123,17 +128,27 @@ 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() );
   
-  image.LoadFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG );
+  image.LoadFile( dir + wxString("test.png") );
   my_square = new wxBitmap( image.ConvertToBitmap() );
   
   CreateAntiAliasedBitmap();
@@ -144,6 +159,8 @@ MyCanvas::~MyCanvas()
   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;
 }
@@ -171,6 +188,12 @@ 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( "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 );
 }
 
 void MyCanvas::CreateAntiAliasedBitmap()
@@ -189,6 +212,7 @@ void MyCanvas::CreateAntiAliasedBitmap()
   dc.DrawText( "And a Rectangle.", 20, 60 );
   
   dc.SetBrush( *wxRED_BRUSH );
+  dc.SetPen( *wxTRANSPARENT_PEN );
   dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 );
   
   wxImage original( bitmap );
@@ -251,7 +275,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, 130 );
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
@@ -262,6 +288,7 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
 void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 {
   (void)wxMessageBox( "wxImage demo\n"
+                      "\n"
                       "Robert Roebling (c) 1998",
                       "About wxImage Demo", wxICON_INFORMATION | wxOK );
 }
@@ -281,6 +308,7 @@ bool MyApp::OnInit()
 #endif
 
   wxImage::AddHandler( new wxGIFHandler );
+  wxImage::AddHandler( new wxPCXHandler );
 
   wxFrame *frame = new MyFrame();
   frame->Show( TRUE );