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

General tidy-up (mainly typecasts) to allow the use of the SGI native

Browse Source 
compilers (tested on Irix 6.5 with -mips3 -n32).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (RO)
1998-08-23 03:22:56 +00:00
parent cb6780ff01
commit c67daf8777
215 changed files with 1654 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/png/pngdemo.cpp
View File

@@ -26,8 +26,8 @@
#include "pngdemo.h"
MyFrame *frame = NULL;
wxBitmap *g_TestBitmap = NULL;
MyFrame *frame = (MyFrame *) NULL;
wxBitmap *g_TestBitmap = (wxBitmap *) NULL;
IMPLEMENT_APP(MyApp)
@@ -42,7 +42,7 @@ bool MyApp::OnInit(void)
#endif
// Create the main frame window
frame = new MyFrame(NULL, "wxPNGBitmap Demo", wxPoint(0, 0), wxSize(300, 300));
frame = new MyFrame((wxFrame *) NULL, "wxPNGBitmap Demo", wxPoint(0, 0), wxSize(300, 300));
// Give it a status line
frame->CreateStatusBar(2);
@@ -86,7 +86,7 @@ END_EVENT_TABLE()
MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
wxFrame(frame, -1, title, pos, size)
{
canvas = NULL;
canvas = (MyCanvas *) NULL;
}
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
@@ -103,7 +103,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
{
// Show file selector.
char *f = wxFileSelector("Open Image", NULL, NULL,"png",
char *f = wxFileSelector("Open Image", (const char *) NULL, (const char *) NULL,"png",
"PNG files (*.png)|*.png");
if (!f)
@@ -115,7 +115,7 @@ void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
if (!g_TestBitmap->Ok())
{
delete g_TestBitmap;
g_TestBitmap = NULL;
g_TestBitmap = (wxBitmap *) NULL;
}
canvas->Refresh();