1. more warnings fixes in gtk/region.cpp and common/tbarsmpl.cpp

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 36879ba4c8d5de673afd91b12728c21d03e6b132..e75e7177d43b158ebebb9c84009ae04bde37d587 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -22,6 +22,8 @@
 
 #include "wx/file.h"
 
 
 #include "wx/file.h"
 

+#include "smile.xbm"
+

 // derived classes
 
 class MyFrame;
 // derived classes
 
 class MyFrame;


@@ -42,9 +44,14 @@ public:
     wxBitmap  *my_horse_jpeg;
     wxBitmap  *my_horse_gif;
     wxBitmap  *my_horse_bmp;
     wxBitmap  *my_horse_jpeg;
     wxBitmap  *my_horse_gif;
     wxBitmap  *my_horse_bmp;

+    wxBitmap  *my_horse_pcx;
+    wxBitmap  *my_horse_pnm;
+    wxBitmap  *my_horse_tiff;
+    wxBitmap  *my_smile_xbm;

     wxBitmap  *my_square;
     wxBitmap  *my_anti;
 
     wxBitmap  *my_square;
     wxBitmap  *my_anti;
 

+private:

     DECLARE_DYNAMIC_CLASS(MyCanvas)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(MyCanvas)
     DECLARE_EVENT_TABLE()
 };


@@ -61,6 +68,7 @@ public:
 
     MyCanvas         *m_canvas;
 
 
     MyCanvas         *m_canvas;
 

+private:

     DECLARE_DYNAMIC_CLASS(MyFrame)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(MyFrame)
     DECLARE_EVENT_TABLE()
 };


@@ -89,99 +97,173 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
                     const wxPoint &pos, const wxSize &size )
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
 {
                     const wxPoint &pos, const wxSize &size )
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
 {

-  my_horse_png = (wxBitmap*) NULL;
-  my_horse_jpeg = (wxBitmap*) NULL;
-  my_horse_gif = (wxBitmap*) NULL;
-  my_horse_bmp = (wxBitmap*) NULL;
-  my_square = (wxBitmap*) NULL;
-  my_anti = (wxBitmap*) NULL;
+    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_horse_pnm = (wxBitmap*) NULL;
+    my_horse_tiff = (wxBitmap*) NULL;
+    my_smile_xbm = (wxBitmap*) NULL;
+    my_square = (wxBitmap*) NULL;
+    my_anti = (wxBitmap*) NULL;
+
+    SetBackgroundColour(* wxWHITE);
+
+    wxBitmap bitmap( 100, 100 );
+
+    wxMemoryDC dc;
+    dc.SelectObject( bitmap );
+    dc.SetBrush( wxBrush( "orange", wxSOLID ) );
+    dc.SetPen( *wxWHITE_PEN );
+    dc.DrawRectangle( 0, 0, 100, 100 );
+    dc.SelectObject( wxNullBitmap );
+
+    // try to find the directory with our images
+    wxString dir;
+    if ( wxFile::Exists("./horse.png") )
+        dir = "./";
+    else if ( wxFile::Exists("../horse.png") )
+        dir = "../";
+    else
+        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");
+
+    if ( !image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG ) )
+        wxLogError("Can't load PNG image");
+    else
+        my_horse_png = new wxBitmap( image.ConvertToBitmap() );
+
+    if ( !image.LoadFile( dir + wxString("horse.jpg") ) )
+        wxLogError("Can't load JPG image");
+    else
+        my_horse_jpeg = new wxBitmap( image.ConvertToBitmap() );
+
+#if wxUSE_GIF
+    if ( !image.LoadFile( dir + wxString("horse.gif") ) )
+        wxLogError("Can't load GIF image");
+    else
+        my_horse_gif = new wxBitmap( image.ConvertToBitmap() );
+#endif

 
 

-  SetBackgroundColour(* wxWHITE);
+#if wxUSE_PCX
+    if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) )
+        wxLogError("Can't load PCX image");
+    else
+        my_horse_pcx = new wxBitmap( image.ConvertToBitmap() );
+#endif

 
 

-  wxBitmap bitmap( 100, 100 );
+    if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) )
+        wxLogError("Can't load BMP image");
+    else
+        my_horse_bmp = new wxBitmap( image.ConvertToBitmap() );

 
 

-  wxMemoryDC dc;
-  dc.SelectObject( bitmap );
-  dc.SetBrush( wxBrush( "orange", wxSOLID ) );
-  dc.SetPen( *wxWHITE_PEN );
-  dc.DrawRectangle( 0, 0, 100, 100 );
-  dc.SelectObject( wxNullBitmap );
-
-  // try to find the directory with our images
-  wxString dir;
-  if ( wxFile::Exists("./horse.png") )
-      dir = "./";
-  else if ( wxFile::Exists("../horse.png") )
-      dir = "../";
-  else
-      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");
-  
-  if ( !image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG ) )
-      wxLogError("Can't load PNG image");
-  else
-    my_horse_png = new wxBitmap( image.ConvertToBitmap() );
-  
-  if ( !image.LoadFile( dir + wxString("horse.jpg"), wxBITMAP_TYPE_JPEG ) )
-      wxLogError("Can't load JPG image");
-  else
-      my_horse_jpeg = new wxBitmap( image.ConvertToBitmap() );
-  
-  if ( !image.LoadFile( dir + wxString("horse.gif"), wxBITMAP_TYPE_GIF ) )
-      wxLogError("Can't load GIF image");
-  else
-    my_horse_gif = 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 );
-  my_square = new wxBitmap( image.ConvertToBitmap() );
-  
-  CreateAntiAliasedBitmap();
+#if wxUSE_PNM
+    if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) )
+        wxLogError("Can't load PNM image");
+    else
+        my_horse_pnm = new wxBitmap( image.ConvertToBitmap() );
+#endif
+
+#if wxUSE_LIBTIFF
+    if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) )
+        wxLogError("Can't load TIFF image");
+    else
+        my_horse_tiff = new wxBitmap( image.ConvertToBitmap() );
+#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 );

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

-  delete my_horse_png;
-  delete my_horse_jpeg;
-  delete my_horse_gif;
-  delete my_horse_bmp;
-  delete my_square;
-  delete my_anti;
+    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_horse_tiff;
+    delete my_smile_xbm;
+    delete my_square;
+    delete my_anti;

 }
 
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
 }
 
 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( "Drawn directly", 150, 10 );
+    dc.SetBrush( wxBrush( "orange", wxSOLID ) );
+    dc.SetPen( *wxWHITE_PEN );
+    dc.DrawRectangle( 150, 30, 100, 100 );
+
+    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 );
+    }

 
 

-  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( "JPEG handler", 30, 365 );
+    if (my_horse_jpeg && my_horse_jpeg->Ok()) 
+        dc.DrawBitmap( *my_horse_jpeg, 30, 380 );

 
 

-  if (my_anti && my_anti->Ok()) dc.DrawBitmap( *my_anti, 250, 140 );
-  
-  dc.DrawText( "PNG handler", 30, 135 );
-  if (my_horse_png && my_horse_png->Ok()) dc.DrawBitmap( *my_horse_png, 30, 150 );
-  
-  dc.DrawText( "JPEG handler", 30, 365 );
-  if (my_horse_jpeg && my_horse_jpeg->Ok()) dc.DrawBitmap( *my_horse_jpeg, 30, 380 );
-  
-  dc.DrawText( "GIF handler", 30, 595 );
-  if (my_horse_gif && my_horse_gif->Ok()) dc.DrawBitmap( *my_horse_gif, 30, 610 );
+    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 );
+
+    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, 815 );
-  if (my_horse_bmp && my_horse_bmp->Ok()) dc.DrawBitmap( *my_horse_bmp, 30, 830 );
+    dc.DrawText( "TIFF handler", 30, 1515 );
+    if (my_horse_tiff && my_horse_tiff->Ok()) 
+        dc.DrawBitmap( *my_horse_pnm, 30, 1530 );
+
+    if (my_smile_xbm && my_smile_xbm->Ok()) 
+    {
+        dc.DrawText( "XBM bitmap", 30, 1745 );
+        dc.SetPen( *wxRED_PEN );
+        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 );
+    }

 }
 
 void MyCanvas::CreateAntiAliasedBitmap()
 }
 
 void MyCanvas::CreateAntiAliasedBitmap()


@@ -193,40 +275,41 @@ void MyCanvas::CreateAntiAliasedBitmap()
   dc.SelectObject( bitmap );
 
   dc.Clear();
   dc.SelectObject( bitmap );
 
   dc.Clear();

-  
-  dc.SetFont( wxFont( 24, wxDECORATIVE, wxDEFAULT, wxDEFAULT ) );
+
+  dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );

   dc.SetTextForeground( "RED" );
   dc.DrawText( "This is anti-aliased Text.", 20, 20 );
   dc.DrawText( "And a Rectangle.", 20, 60 );
   dc.SetTextForeground( "RED" );
   dc.DrawText( "This is anti-aliased Text.", 20, 20 );
   dc.DrawText( "And a Rectangle.", 20, 60 );

-  
+

   dc.SetBrush( *wxRED_BRUSH );
   dc.SetBrush( *wxRED_BRUSH );

+  dc.SetPen( *wxTRANSPARENT_PEN );

   dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 );
   dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 );

-  
+

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

-  
+

   for (int y = 1; y < 149; y++)
     for (int x = 1; x < 149; x++)
     {
        int red = original.GetRed( x*2, y*2 ) +
   for (int y = 1; y < 149; y++)
     for (int x = 1; x < 149; x++)
     {
        int red = original.GetRed( x*2, y*2 ) +

-                 original.GetRed( x*2-1, y*2 ) + 
-                 original.GetRed( x*2, y*2+1 ) + 
+                 original.GetRed( x*2-1, y*2 ) +
+                 original.GetRed( x*2, y*2+1 ) +

                  original.GetRed( x*2+1, y*2+1 );
                  original.GetRed( x*2+1, y*2+1 );

-       red = red/4; 
-       
+       red = red/4;
+

        int green = original.GetGreen( x*2, y*2 ) +
        int green = original.GetGreen( x*2, y*2 ) +

-                   original.GetGreen( x*2-1, y*2 ) + 
-                   original.GetGreen( x*2, y*2+1 ) + 
+                   original.GetGreen( x*2-1, y*2 ) +
+                   original.GetGreen( x*2, y*2+1 ) +

                    original.GetGreen( x*2+1, y*2+1 );
                    original.GetGreen( x*2+1, y*2+1 );

-       green = green/4; 
-       
+       green = green/4;
+

        int blue = original.GetBlue( x*2, y*2 ) +
        int blue = original.GetBlue( x*2, y*2 ) +

-                  original.GetBlue( x*2-1, y*2 ) + 
-                  original.GetBlue( x*2, y*2+1 ) + 
+                  original.GetBlue( x*2-1, y*2 ) +
+                  original.GetBlue( x*2, y*2+1 ) +

                   original.GetBlue( x*2+1, y*2+1 );
                   original.GetBlue( x*2+1, y*2+1 );

-       blue = blue/4; 
+       blue = blue/4;

        anti.SetRGB( x, y, red, green, blue );
     }
   my_anti = new wxBitmap( anti.ConvertToBitmap() );
        anti.SetRGB( x, y, red, green, blue );
     }
   my_anti = new wxBitmap( anti.ConvertToBitmap() );


@@ -262,7 +345,9 @@ MyFrame::MyFrame()
   SetStatusWidths( 2, widths );
 
   m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
   SetStatusWidths( 2, widths );
 
   m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );

-  m_canvas->SetScrollbars( 10, 10, 50, 100 );
+
+  // 500 width * 1900 height
+  m_canvas->SetScrollbars( 10, 10, 50, 190 );

 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )


@@ -273,6 +358,7 @@ 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",
                       "About wxImage Demo", wxICON_INFORMATION | wxOK );
 }
                       "Robert Roebling (c) 1998",
                       "About wxImage Demo", wxICON_INFORMATION | wxOK );
 }


@@ -291,7 +377,21 @@ bool MyApp::OnInit()
   wxImage::AddHandler( new wxJPEGHandler );
 #endif
 
   wxImage::AddHandler( new wxJPEGHandler );
 #endif
 

+#if wxUSE_LIBTIFF
+  wxImage::AddHandler( new wxTIFFHandler );
+#endif
+
+#if wxUSE_GIF

   wxImage::AddHandler( new wxGIFHandler );
   wxImage::AddHandler( new wxGIFHandler );

+#endif
+
+#if wxUSE_PCX
+  wxImage::AddHandler( new wxPCXHandler );
+#endif
+
+#if wxUSE_PNM
+  wxImage::AddHandler( new wxPNMHandler );
+#endif

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