A few tweaks and cleanups

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 706be54393544c02f9b0a26af79e886538ab6107..262078f92c0773e3de1a066aa376afab19247b79 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -52,11 +52,17 @@ public:
     wxBitmap  *my_horse_pnm;
     wxBitmap  *my_horse_tiff;
     wxBitmap  *my_horse_xpm;
     wxBitmap  *my_horse_pnm;
     wxBitmap  *my_horse_tiff;
     wxBitmap  *my_horse_xpm;

-
+    wxBitmap  *my_horse_ico32;
+    wxBitmap  *my_horse_ico16;
+    wxBitmap  *my_horse_ico;
+    wxBitmap  *my_horse_cur;
+    

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

+    int xH, yH ;
+

 protected:
     wxBitmap m_bmpSmileXpm;
     wxIcon   m_iconSmileXpm;
 protected:
     wxBitmap m_bmpSmileXpm;
     wxIcon   m_iconSmileXpm;


@@ -126,12 +132,13 @@ public:
     void OnPaint(wxPaintEvent& WXUNUSED(event))
     {
         wxPaintDC dc( this );
     void OnPaint(wxPaintEvent& WXUNUSED(event))
     {
         wxPaintDC dc( this );

-        dc.DrawBitmap( m_bitmap, 0, 0 );
+        //TRUE for masked images
+        dc.DrawBitmap( m_bitmap, 0, 0, TRUE );

     }
 
     void OnSave(wxCommandEvent& WXUNUSED(event))
     {
     }
 
     void OnSave(wxCommandEvent& WXUNUSED(event))
     {

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

 
         int bppselection = wxGetSingleChoiceIndex("Set BMP BPP",
                                                   "Set BMP BPP",
 
         int bppselection = wxGetSingleChoiceIndex("Set BMP BPP",
                                                   "Set BMP BPP",


@@ -144,7 +151,7 @@ public:
             return;
         }
 
             return;
         }
 

-        image.SetOption(wxBMP_FORMAT, bppvalues[bppselection]);
+        image.SetOption(wxIMAGE_OPTION_BMP_FORMAT, bppvalues[bppselection]);

 
         wxString deffilename = bppchoices[bppselection];
         deffilename.Replace(wxT(" "), wxT("_"));
 
         wxString deffilename = bppchoices[bppselection];
         deffilename.Replace(wxT(" "), wxT("_"));


@@ -158,13 +165,15 @@ public:
                                             wxT("JPEG files (*.jpg)|*.jpg|")
                                             wxT("GIF files (*.gif)|*.gif|")
                                             wxT("TIFF files (*.tif)|*.tif|")
                                             wxT("JPEG files (*.jpg)|*.jpg|")
                                             wxT("GIF files (*.gif)|*.gif|")
                                             wxT("TIFF files (*.tif)|*.tif|")

-                                            wxT("PCX files (*.pcx)|*.pcx"),
+                                            wxT("PCX files (*.pcx)|*.pcx|")
+                                            wxT("ICO files (*.ico)|*.ico|")
+                                            wxT("CUR files (*.cur)|*.cur"),

                                                 wxSAVE);
 
         if ( savefilename.empty() )
             return;
 
                                                 wxSAVE);
 
         if ( savefilename.empty() )
             return;
 

-        if ( image.GetOptionInt(wxBMP_FORMAT) == wxBMP_8BPP_PALETTE )
+        if ( image.GetOptionInt(wxIMAGE_OPTION_BMP_FORMAT) == wxBMP_8BPP_PALETTE )

         {
             unsigned char *cmap = new unsigned char [256];
             for ( int i = 0; i < 256; i++ )
         {
             unsigned char *cmap = new unsigned char [256];
             for ( int i = 0; i < 256; i++ )


@@ -174,25 +183,28 @@ public:
             delete cmap;
         }
 
             delete cmap;
         }
 

-        bool saved = FALSE;
-
+        bool loaded;

         wxString extension = savefilename.AfterLast('.').Lower();
 
         wxString extension = savefilename.AfterLast('.').Lower();
 

-        if (extension == "bmp")
-            saved=image.SaveFile(savefilename, wxBITMAP_TYPE_BMP);
-        else if (extension == "png")
-            saved=image.SaveFile(savefilename, wxBITMAP_TYPE_PNG);
-        else if (extension == "pcx")
-            saved=image.SaveFile(savefilename, wxBITMAP_TYPE_PCX);
-        else if ((extension == "tif") || (extension == "tiff"))
-            saved=image.SaveFile(savefilename, wxBITMAP_TYPE_TIF);
-        else if (extension == "jpg")
-            saved=image.SaveFile(savefilename, wxBITMAP_TYPE_JPEG);
-        else if (extension == "pnm")
-            saved=image.SaveFile(savefilename, wxBITMAP_TYPE_PNM);
-        else
-            wxMessageBox("Unknown file type, see options in file selector.",
-                         "Unknown file type",
+        if (extension == "cur")
+        {
+            image.Rescale(32,32);    
+            image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, 0);    
+            image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, 0);
+            // This shows how you can save an image with explicitly
+            // specified image format:
+            loaded = image.SaveFile(savefilename, wxBITMAP_TYPE_CUR);
+        }
+        else 
+        {
+            // This one guesses image format from filename extension
+            // (it may fail if the extension is not recognized):
+            loaded = image.SaveFile(savefilename);
+        }
+        
+        if ( !loaded )
+            wxMessageBox("No handler for this file type.",
+                         "File was not saved",

                          wxOK|wxCENTRE, this);
     }
 
                          wxOK|wxCENTRE, this);
     }
 


@@ -243,6 +255,11 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     my_horse_pnm = (wxBitmap*) NULL;
     my_horse_tiff = (wxBitmap*) NULL;
     my_horse_xpm = (wxBitmap*) NULL;
     my_horse_pnm = (wxBitmap*) NULL;
     my_horse_tiff = (wxBitmap*) NULL;
     my_horse_xpm = (wxBitmap*) NULL;

+    my_horse_ico32 = (wxBitmap*) NULL;
+    my_horse_ico16 = (wxBitmap*) NULL;
+    my_horse_ico = (wxBitmap*) NULL;
+    my_horse_cur = (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;


@@ -253,7 +270,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     wxMemoryDC dc;
     dc.SelectObject( bitmap );
 
     wxMemoryDC dc;
     dc.SelectObject( bitmap );

-    dc.SetBrush( wxBrush( "orange", wxSOLID ) );
+    dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );

     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 0, 0, 100, 100 );
     dc.SetBrush( *wxWHITE_BRUSH );
     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 0, 0, 100, 100 );
     dc.SetBrush( *wxWHITE_BRUSH );


@@ -300,7 +317,8 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 #if wxUSE_GIF
     image.Destroy();
 
 #if wxUSE_GIF
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.gif")) )
+    if ( !image.LoadFile( dir + wxString("horse.gif")))
+    //if ( !image.LoadFile( wxString("\\slidbar.gif"), wxBITMAP_TYPE_GIF, -2) )

         wxLogError(wxT("Can't load GIF image"));
     else
         my_horse_gif = new wxBitmap( image );
         wxLogError(wxT("Can't load GIF image"));
     else
         my_horse_gif = new wxBitmap( image );


@@ -362,6 +380,42 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     if ( m_bmpSmileXpm.Ok() )
         m_bmpSmileXpm.SaveFile("saved.xpm", wxBITMAP_TYPE_XPM);
 #endif
     if ( m_bmpSmileXpm.Ok() )
         m_bmpSmileXpm.SaveFile("saved.xpm", wxBITMAP_TYPE_XPM);
 #endif

+
+#if wxUSE_ICO_CUR
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + wxString("horse.ico"), wxBITMAP_TYPE_ICO, 0 ) )
+        wxLogError(wxT("Can't load first ICO image"));
+    else
+        my_horse_ico32 = new wxBitmap( image );
+        
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + wxString("horse.ico"), wxBITMAP_TYPE_ICO, 1 ) )
+        wxLogError(wxT("Can't load second ICO image"));
+    else
+        my_horse_ico16 = new wxBitmap( image );
+
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + wxString("horse.ico") ) )
+        wxLogError(wxT("Can't load best ICO image"));
+    else
+        my_horse_ico = new wxBitmap( image );
+
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + wxString("horse.cur"), wxBITMAP_TYPE_CUR ) )
+        wxLogError(wxT("Can't load best ICO image"));
+    else
+        {
+        my_horse_cur = new wxBitmap( image );
+        xH = 30 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) ;
+        yH = 2420 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ;
+        }
+    
+#endif
+

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


@@ -374,6 +428,10 @@ MyCanvas::~MyCanvas()
     delete my_horse_pcx;
     delete my_horse_tiff;
     delete my_horse_xpm;
     delete my_horse_pcx;
     delete my_horse_tiff;
     delete my_horse_xpm;

+    delete my_horse_ico32;
+    delete my_horse_ico16;
+    delete my_horse_ico;
+    delete my_horse_cur;

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


@@ -388,7 +446,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 );
 
     dc.DrawText( "Drawn directly", 150, 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.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );

     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 150, 30, 100, 100 );
     dc.SetBrush( *wxWHITE_BRUSH );
     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 150, 30, 100, 100 );
     dc.SetBrush( *wxWHITE_BRUSH );


@@ -435,26 +493,27 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if (my_horse_xpm && my_horse_xpm->Ok())
         dc.DrawBitmap( *my_horse_xpm, 30, 1760 );
 
     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, 1975 );
         dc.DrawText( "(green on red)", 30, 1990 );
     if (my_smile_xbm && my_smile_xbm->Ok())
     {
         dc.DrawText( "XBM bitmap", 30, 1975 );
         dc.DrawText( "(green on red)", 30, 1990 );

-        dc.SetTextForeground( "GREEN" );
-        dc.SetTextBackground( "RED" );
+        dc.SetTextForeground( wxT("GREEN") );
+        dc.SetTextBackground( wxT("RED") );

         dc.DrawBitmap( *my_smile_xbm, 30, 2010 );
 
         dc.DrawBitmap( *my_smile_xbm, 30, 2010 );
 

-        dc.SetTextForeground( "BLACK" );
+        dc.SetTextForeground( wxT("BLACK") );

         dc.DrawText( "After wxImage conversion", 150, 1975 );
         dc.DrawText( "(red on white)", 150, 1990 );
         dc.DrawText( "After wxImage conversion", 150, 1975 );
         dc.DrawText( "(red on white)", 150, 1990 );

-        dc.SetTextForeground( "RED" );
+        dc.SetTextForeground( wxT("RED") );

         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() );
         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() );

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

     }
 
 
     }
 
 


@@ -476,22 +535,22 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     {
         dc.DrawText( "Mono bitmap", 30, 2095 );
         dc.DrawText( "(red on green)", 30, 2110 );
     {
         dc.DrawText( "Mono bitmap", 30, 2095 );
         dc.DrawText( "(red on green)", 30, 2110 );

-        dc.SetTextForeground( "RED" );
-        dc.SetTextBackground( "GREEN" );
+        dc.SetTextForeground( wxT("RED") );
+        dc.SetTextBackground( wxT("GREEN") );

         dc.DrawBitmap( mono, 30, 2130 );
 
         dc.DrawBitmap( mono, 30, 2130 );
 

-        dc.SetTextForeground( "BLACK" );
+        dc.SetTextForeground( wxT("BLACK") );

         dc.DrawText( "After wxImage conversion", 150, 2095 );
         dc.DrawText( "(red on white)", 150, 2110 );
         dc.DrawText( "After wxImage conversion", 150, 2095 );
         dc.DrawText( "(red on white)", 150, 2110 );

-        dc.SetTextForeground( "RED" );
+        dc.SetTextForeground( wxT("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() );
         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() );

-        dc.DrawBitmap( i.ConvertToBitmap(), 150, 2130, TRUE );
-        dc.SetTextForeground( "BLACK" );
+        dc.DrawBitmap( wxBitmap(i), 150, 2130, TRUE );
+        dc.SetTextForeground( wxT("BLACK") );

     }
 
     dc.DrawText("XPM bitmap", 30, 2230);
     }
 
     dc.DrawText("XPM bitmap", 30, 2230);


@@ -505,6 +564,27 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     {
         dc.DrawIcon(m_iconSmileXpm, 150, 2250);
     }
     {
         dc.DrawIcon(m_iconSmileXpm, 150, 2250);
     }

+
+    dc.DrawText( "ICO handler (1st image)", 30, 2290 );
+    if (my_horse_ico32 && my_horse_ico32->Ok())
+        dc.DrawBitmap( *my_horse_ico32, 30, 2330, TRUE );
+
+    dc.DrawText( "ICO handler (2nd image)", 230, 2290 );
+    if (my_horse_ico16 && my_horse_ico16->Ok())
+        dc.DrawBitmap( *my_horse_ico16, 230, 2330, TRUE );
+        
+    dc.DrawText( "ICO handler (best image)", 430, 2290 );
+    if (my_horse_ico && my_horse_ico->Ok())
+        dc.DrawBitmap( *my_horse_ico, 430, 2330, TRUE );
+
+    dc.DrawText( "CUR handler", 30, 2390 );
+    if (my_horse_cur && my_horse_cur->Ok())
+        {
+        dc.DrawBitmap( *my_horse_cur, 30, 2420, TRUE );
+        dc.SetPen (*wxRED_PEN);
+        dc.DrawLine (xH-10,yH,xH+10,yH);
+        dc.DrawLine (xH,yH-10,xH,yH+10);
+        }

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


@@ -518,7 +598,7 @@ void MyCanvas::CreateAntiAliasedBitmap()
   dc.Clear();
 
   dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );
   dc.Clear();
 
   dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );

-  dc.SetTextForeground( "RED" );
+  dc.SetTextForeground( wxT("RED") );

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


@@ -553,7 +633,7 @@ void MyCanvas::CreateAntiAliasedBitmap()
        blue = blue/4;
        anti.SetRGB( x, y, red, green, blue );
     }
        blue = blue/4;
        anti.SetRGB( x, y, red, green, blue );
     }

-  my_anti = new wxBitmap( anti.ConvertToBitmap() );
+  my_anti = new wxBitmap(anti);

 }
 
 // MyFrame
 }
 
 // MyFrame


@@ -592,8 +672,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 * 2100 height
-  m_canvas->SetScrollbars( 10, 10, 50, 220 );
+  // 500 width * 2500 height
+  m_canvas->SetScrollbars( 10, 10, 50, 250 );

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


@@ -622,7 +702,7 @@ void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
         return;
     }
 
         return;
     }
 

-    (new MyImageFrame(this, image.ConvertToBitmap()))->Show();
+    (new MyImageFrame(this, wxBitmap(image)))->Show();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -659,6 +739,11 @@ bool MyApp::OnInit()
   wxImage::AddHandler( new wxXPMHandler );
 #endif
 
   wxImage::AddHandler( new wxXPMHandler );
 #endif
 

+#if wxUSE_ICO_CUR
+  wxImage::AddHandler( new wxICOHandler );
+  wxImage::AddHandler( new wxCURHandler );
+#endif
+

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