Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't use deprecated wxImage methods inside wxWin

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-03-24 00:22:15 +00:00
parent a460c732db
commit 368d59f0d8
19 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/dnd/dnd.cpp
View File

@@ -1217,7 +1217,7 @@ void DnDFrame::OnCopyBitmap(wxCommandEvent& WXUNUSED(event))
wxLogStatus( _T("Decoding image file...") );
wxYield();
wxBitmap bitmap( image.ConvertToBitmap() );
wxBitmap bitmap( image );
if ( !wxTheClipboard->Open() )
{

4
samples/dragimag/dragimag.cpp
View File

@@ -382,7 +382,7 @@ bool MyApp::OnInit()
wxImage image;
if (image.LoadFile("backgrnd.png", wxBITMAP_TYPE_PNG))
{
m_background = image.ConvertToBitmap();
m_background = wxBitmap(image);
}
MyFrame *frame = new MyFrame();
@@ -399,7 +399,7 @@ bool MyApp::OnInit()
the first file over the second file. */
if (image.LoadFile(filename, wxBITMAP_TYPE_PNG))
{
DragShape* newShape = new DragShape(image.ConvertToBitmap());
DragShape* newShape = new DragShape(wxBitmap(image));
newShape->SetPosition(wxPoint(i*50, i*50));
if (i == 2)

10
samples/image/image.cpp
View File

@@ -138,7 +138,7 @@ public:
void OnSave(wxCommandEvent& WXUNUSED(event))
{
wxImage image(m_bitmap);
wxImage image = m_bitmap.ConvertToImage();
int bppselection = wxGetSingleChoiceIndex("Set BMP BPP",
"Set BMP BPP",
@@ -512,7 +512,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
wxRED_PEN->GetColour().Red(),
wxRED_PEN->GetColour().Green(),
wxRED_PEN->GetColour().Blue() );
dc.DrawBitmap( i.ConvertToBitmap(), 150, 2010, TRUE );
dc.DrawBitmap( wxBitmap(i), 150, 2010, TRUE );
dc.SetTextForeground( wxT("BLACK") );
}
@@ -549,7 +549,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
wxRED_PEN->GetColour().Red(),
wxRED_PEN->GetColour().Green(),
wxRED_PEN->GetColour().Blue() );
dc.DrawBitmap( i.ConvertToBitmap(), 150, 2130, TRUE );
dc.DrawBitmap( wxBitmap(i), 150, 2130, TRUE );
dc.SetTextForeground( wxT("BLACK") );
}
@@ -633,7 +633,7 @@ void MyCanvas::CreateAntiAliasedBitmap()
blue = blue/4;
anti.SetRGB( x, y, red, green, blue );
}
my_anti = new wxBitmap( anti.ConvertToBitmap() );
my_anti = new wxBitmap(anti);
}
// MyFrame
@@ -702,7 +702,7 @@ void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
return;
}
(new MyImageFrame(this, image.ConvertToBitmap()))->Show();
(new MyImageFrame(this, wxBitmap(image)))->Show();
}
//-----------------------------------------------------------------------------

6
samples/rotate/rotate.cpp
View File

@@ -161,10 +161,10 @@ void MyCanvas::OnMouseLeftUp (wxMouseEvent & event)
const wxImage& img = wxGetApp().GetImage();
wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), TRUE, &offset);
wxBitmap bmp = img2.ConvertToBitmap ();
wxBitmap bmp(img2);
wxClientDC dc (this);
dc.DrawBitmap (img2.ConvertToBitmap(), event.m_x + offset.x, event.m_y + offset.y, TRUE);
dc.DrawBitmap (bmp, event.m_x + offset.x, event.m_y + offset.y, TRUE);
}
// without interpolation, and without offset correction
@@ -175,7 +175,7 @@ void MyCanvas::OnMouseRightUp (wxMouseEvent & event)
const wxImage& img = wxGetApp().GetImage();
wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), FALSE);
wxBitmap bmp = img2.ConvertToBitmap ();
wxBitmap bmp(img2);
wxClientDC dc (this);
dc.DrawBitmap (bmp, event.m_x, event.m_y, TRUE);

2
samples/toolbar/toolbar.cpp
View File

@@ -274,7 +274,7 @@ void MyFrame::RecreateToolbar()
for ( size_t n = 0; n < WXSIZEOF(toolBarBitmaps); n++ )
{
toolBarBitmaps[n] =
wxImage(toolBarBitmaps[n]).Scale(w, h).ConvertToBitmap();
wxBitmap(toolBarBitmaps[n].ConvertToImage().Scale(w, h));
}
toolBar->SetToolBitmapSize(wxSize(w, h));

6
samples/treectrl/treetest.cpp
View File

@@ -669,8 +669,7 @@ void MyTreeCtrl::CreateImageList(int size)
}
else
{
images->Add(wxImage(icons[i]).Rescale(size, size).
ConvertToBitmap());
images->Add(wxBitmap(icons[i].ConvertToImage().Rescale(size, size)));
}
}
#endif // MSW/!MSW
@@ -714,8 +713,7 @@ void MyTreeCtrl::CreateButtonsImageList(int size)
}
else
{
images->Add(wxImage(icons[i]).Rescale(size, size).
ConvertToBitmap());
images->Add(wxBitmap(icons[i].ConvertToImage().Rescale(size, size)));
}
}
#endif // MSW/!MSW