// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma hdrstop
#endif
-#ifdef __WXMSW__
-#include <wx/pnghand.h>
-// #include <wx/xpmhand.h>
-#endif
+#include "wx/image.h"
#include "pngdemo.h"
IMPLEMENT_APP(MyApp)
-MyApp::MyApp()
-{
-}
-
bool MyApp::OnInit(void)
{
-#ifdef __WXMSW__
- wxBitmap::AddHandler(new wxPNGFileHandler);
-// wxBitmap::AddHandler(new wxXPMFileHandler);
-// wxBitmap::AddHandler(new wxXPMDataHandler);
-#endif
+ wxImage::AddHandler(new wxPNGHandler);
// Create the main frame window
- frame = new MyFrame((wxFrame *) NULL, "wxPNGBitmap Demo", wxPoint(0, 0), wxSize(300, 300));
+ frame = new MyFrame((wxFrame *) NULL, _T("wxPNGBitmap Demo"), wxPoint(0, 0), wxSize(300, 300));
+#if wxUSE_STATUSBAR
// Give it a status line
frame->CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR
// Make a menubar
wxMenu *file_menu = new wxMenu;
wxMenu *help_menu = new wxMenu;
- file_menu->Append(PNGDEMO_LOAD_FILE, "&Load file", "Load file");
- file_menu->Append(PNGDEMO_SAVE_FILE, "&Save file", "Save file");
- file_menu->Append(PNGDEMO_QUIT, "E&xit", "Quit program");
- help_menu->Append(PNGDEMO_ABOUT, "&About", "About PNG demo");
+ file_menu->Append(PNGDEMO_LOAD_FILE, _T("&Load file"), _T("Load file"));
+ file_menu->Append(PNGDEMO_SAVE_FILE, _T("&Save file"), _T("Save file"));
+ file_menu->Append(PNGDEMO_QUIT, _T("E&xit"), _T("Quit program"));
+ help_menu->Append(PNGDEMO_ABOUT, _T("&About"), _T("About PNG demo"));
wxMenuBar *menu_bar = new wxMenuBar;
- menu_bar->Append(file_menu, "&File");
- menu_bar->Append(help_menu, "&Help");
+ menu_bar->Append(file_menu, _T("&File"));
+ menu_bar->Append(help_menu, _T("&Help"));
// Associate the menu bar with the frame
frame->SetMenuBar(menu_bar);
// canvas->SetScrollbars(20, 20, 50, 50, 4, 4);
frame->canvas = canvas;
- frame->Show(TRUE);
+ frame->Show(true);
- frame->SetStatusText("Hello, wxWindows");
+#if wxUSE_STATUSBAR
+ frame->SetStatusText(_T("Hello, wxWidgets"));
+#endif // wxUSE_STATUSBAR
- return TRUE;
+ return true;
}
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
// Define my frame constructor
MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
- wxFrame(frame, -1, title, pos, size)
+ wxFrame(frame, wxID_ANY, title, pos, size)
{
canvas = (MyCanvas *) NULL;
}
+// frame destructor
+MyFrame::~MyFrame()
+{
+ if (g_TestBitmap)
+ {
+ delete g_TestBitmap;
+ g_TestBitmap = (wxBitmap *) NULL;
+ }
+}
+
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
- Close(TRUE);
+ Close(true);
}
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
- (void)wxMessageBox("PNG demo\nJulian Smart (c) 1998",
- "About PNG Demo", wxOK);
+ (void)wxMessageBox(_T("PNG demo\nJulian Smart (c) 1998"),
+ _T("About PNG Demo"), wxOK);
}
void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event))
{
- wxString f = wxFileSelector( "Save Image", (const char *)NULL, (const char *)NULL,
- "png", "PNG files (*.png)|*.png" );
+ wxString f = wxFileSelector( wxT("Save Image"), (const wxChar *)NULL,
+ (const wxChar *)NULL,
+ wxT("png"), wxT("PNG files (*.png)|*.png") );
+
+ if (f == _T("")) return;
- if (f == "") return;
-
wxBitmap *backstore = new wxBitmap( 150, 150 );
-
+
wxMemoryDC memDC;
memDC.SelectObject( *backstore );
memDC.Clear();
memDC.SetPen( *wxBLACK_PEN );
memDC.DrawLine( 0, 0, 0, 10 );
memDC.SetTextForeground( *wxWHITE );
- memDC.DrawText( "This is a memory dc.", 10, 10 );
-
+ memDC.DrawText( _T("This is a memory dc."), 10, 10 );
+
memDC.SelectObject( wxNullBitmap );
-
+
backstore->SaveFile( f, wxBITMAP_TYPE_PNG, (wxPalette*)NULL );
-
+
delete backstore;
}
void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
{
- // Show file selector.
- wxString f = wxFileSelector("Open Image", (const char *) NULL, (const char *) NULL,"png",
- "PNG files (*.png)|*.png");
+ // Show file selector.
+ wxString f = wxFileSelector(wxT("Open Image"), (const wxChar *) NULL,
+ (const wxChar *) NULL, wxT("png"),
+ wxT("PNG files (*.png)|*.png"));
- if (f == "")
- return;
+ if (f == _T(""))
+ return;
if ( g_TestBitmap )
delete g_TestBitmap;
+
g_TestBitmap = new wxBitmap(f, wxBITMAP_TYPE_PNG);
if (!g_TestBitmap->Ok())
{
// Define a constructor for my canvas
MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
- wxScrolledWindow(parent, -1, pos, size)
-{
-}
-
-MyCanvas::~MyCanvas(void)
+ wxScrolledWindow(parent, wxID_ANY, pos, size)
{
}
memDC.SelectObject(* g_TestBitmap);
// Normal, non-transparent blitting
- dc.Blit(20, 20, g_TestBitmap->GetWidth(), g_TestBitmap->GetHeight(), & memDC, 0, 0, wxCOPY, FALSE);
+ dc.Blit(20, 20, g_TestBitmap->GetWidth(), g_TestBitmap->GetHeight(), & memDC, 0, 0, wxCOPY, false);
memDC.SelectObject(wxNullBitmap);
}
// Transparent blitting if there's a mask in the bitmap
dc.Blit(20 + g_TestBitmap->GetWidth() + 20, 20, g_TestBitmap->GetWidth(), g_TestBitmap->GetHeight(), & memDC,
- 0, 0, wxCOPY, TRUE);
+ 0, 0, wxCOPY, true);
memDC.SelectObject(wxNullBitmap);
}
}
-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-bool MyFrame::OnClose(void)
-{
- Show(FALSE);
-
- return TRUE;
-}
projects / wxWidgets.git / blobdiff