projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.
[wxWidgets.git]
/
samples
/
png
/
pngdemo.cpp
diff --git
a/samples/png/pngdemo.cpp
b/samples/png/pngdemo.cpp
index e28ab8a588f6214d3e1de61a01e9d6b5d72aceaa..473340a6e95e51fd39794423d36c31388eb2e47d 100644
(file)
--- a/
samples/png/pngdemo.cpp
+++ b/
samples/png/pngdemo.cpp
@@
-20,9
+20,7
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#ifdef __WXMSW__
-#include <wx/pnghand.h>
-#endif
+#include "wx/image.h"
#include "pngdemo.h"
#include "pngdemo.h"
@@
-37,9
+35,7
@@
MyApp::MyApp()
bool MyApp::OnInit(void)
{
bool MyApp::OnInit(void)
{
-#ifdef __WXMSW__
- wxBitmap::AddHandler(new wxPNGFileHandler);
-#endif
+ wxImage::AddHandler(new wxPNGHandler);
// Create the main frame window
frame = new MyFrame((wxFrame *) NULL, "wxPNGBitmap Demo", wxPoint(0, 0), wxSize(300, 300));
// Create the main frame window
frame = new MyFrame((wxFrame *) NULL, "wxPNGBitmap Demo", wxPoint(0, 0), wxSize(300, 300));
@@
-104,10
+100,10
@@
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event))
{
void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event))
{
- char *f = wxFileSelector( "Save Image", (const char *)NULL, (const char *)NULL,
+ wxString f = wxFileSelector( "Save Image", (const char *)NULL, (const char *)NULL,
"png", "PNG files (*.png)|*.png" );
"png", "PNG files (*.png)|*.png" );
- if (
!f
) return;
+ if (
f == ""
) return;
wxBitmap *backstore = new wxBitmap( 150, 150 );
wxBitmap *backstore = new wxBitmap( 150, 150 );
@@
-132,10
+128,10
@@
void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
{
// Show file selector.
void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
{
// Show file selector.
-
char *
f = wxFileSelector("Open Image", (const char *) NULL, (const char *) NULL,"png",
+
wxString
f = wxFileSelector("Open Image", (const char *) NULL, (const char *) NULL,"png",
"PNG files (*.png)|*.png");
"PNG files (*.png)|*.png");
- if (
!f
)
+ if (
f == ""
)
return;
if ( g_TestBitmap )
return;
if ( g_TestBitmap )
@@
-178,10
+174,10
@@
void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
if ( g_TestBitmap && g_TestBitmap->Ok() )
{
wxMemoryDC memDC;
if ( g_TestBitmap && g_TestBitmap->Ok() )
{
wxMemoryDC memDC;
- if ( g_TestBitmap->Get
ColourMap
() )
+ if ( g_TestBitmap->Get
Palette
() )
{
{
- memDC.SetPalette(* g_TestBitmap->Get
ColourMap
());
- dc.SetPalette(* g_TestBitmap->Get
ColourMap
());
+ memDC.SetPalette(* g_TestBitmap->Get
Palette
());
+ dc.SetPalette(* g_TestBitmap->Get
Palette
());
}
memDC.SelectObject(* g_TestBitmap);
}
memDC.SelectObject(* g_TestBitmap);
@@
-204,12
+200,4
@@
void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
}
}
}
}
-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-bool MyFrame::OnClose(void)
-{
- Show(FALSE);
-
- return TRUE;
-}