General tidy-up (mainly typecasts) to allow the use of the SGI native
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:
@@ -203,7 +203,7 @@ bool DrawingCommand::Undo(void)
|
||||
doc->GetDoodleSegments().Append(segment);
|
||||
doc->Modify(TRUE);
|
||||
doc->UpdateAllViews();
|
||||
segment = NULL;
|
||||
segment = (DoodleSegment *) NULL;
|
||||
}
|
||||
doc->Modify(TRUE);
|
||||
doc->UpdateAllViews();
|
||||
|
@@ -41,7 +41,7 @@
|
||||
#include "doc.h"
|
||||
#include "view.h"
|
||||
|
||||
MyFrame *frame = NULL;
|
||||
MyFrame *frame = (MyFrame *) NULL;
|
||||
|
||||
// In single window mode, don't have any child windows; use
|
||||
// main window.
|
||||
@@ -51,7 +51,7 @@ IMPLEMENT_APP(MyApp)
|
||||
|
||||
MyApp::MyApp(void)
|
||||
{
|
||||
m_docManager = NULL;
|
||||
m_docManager = (wxDocManager *) NULL;
|
||||
}
|
||||
|
||||
bool MyApp::OnInit(void)
|
||||
@@ -88,7 +88,7 @@ bool MyApp::OnInit(void)
|
||||
CLASSINFO(TextEditDocument), CLASSINFO(TextEditView));
|
||||
|
||||
//// Create the main frame window
|
||||
frame = new MyFrame(m_docManager, NULL, -1, "DocView Demo", wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE);
|
||||
frame = new MyFrame(m_docManager, (wxFrame *) NULL, -1, "DocView Demo", wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE);
|
||||
|
||||
//// Give it an icon (this is ignored in MDI mode: uses resources)
|
||||
#ifdef __WXMSW__
|
||||
@@ -97,7 +97,7 @@ bool MyApp::OnInit(void)
|
||||
|
||||
//// Make a menubar
|
||||
wxMenu *file_menu = new wxMenu;
|
||||
wxMenu *edit_menu = NULL;
|
||||
wxMenu *edit_menu = (wxMenu *) NULL;
|
||||
|
||||
file_menu->Append(wxID_NEW, "&New...");
|
||||
file_menu->Append(wxID_OPEN, "&Open...");
|
||||
@@ -138,7 +138,7 @@ bool MyApp::OnInit(void)
|
||||
menu_bar->Append(help_menu, "&Help");
|
||||
|
||||
if (singleWindowMode)
|
||||
frame->canvas = frame->CreateCanvas(NULL, frame);
|
||||
frame->canvas = frame->CreateCanvas((wxView *) NULL, frame);
|
||||
|
||||
//// Associate the menu bar with the frame
|
||||
frame->SetMenuBar(menu_bar);
|
||||
@@ -189,7 +189,7 @@ wxFrame *MyApp::CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas)
|
||||
file_menu->Append(wxID_PREVIEW, "Print Pre&view");
|
||||
}
|
||||
|
||||
wxMenu *edit_menu = NULL;
|
||||
wxMenu *edit_menu = (wxMenu *) NULL;
|
||||
|
||||
if (isCanvas)
|
||||
{
|
||||
@@ -234,8 +234,8 @@ MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxS
|
||||
wxDocParentFrame(manager, frame, id, title, pos, size, type)
|
||||
{
|
||||
// This pointer only needed if in single window mode
|
||||
canvas = NULL;
|
||||
editMenu = NULL;
|
||||
canvas = (MyCanvas *) NULL;
|
||||
editMenu = (wxMenu *) NULL;
|
||||
}
|
||||
|
||||
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
|
||||
|
@@ -128,14 +128,14 @@ bool DrawingView::OnClose(bool deleteWindow)
|
||||
// Clear the canvas in case we're in single-window mode,
|
||||
// and the canvas stays.
|
||||
canvas->Clear();
|
||||
canvas->view = NULL;
|
||||
canvas = NULL;
|
||||
canvas->view = (wxView *) NULL;
|
||||
canvas = (MyCanvas *) NULL;
|
||||
|
||||
wxString s(wxTheApp->GetAppName());
|
||||
if (frame)
|
||||
frame->SetTitle(s);
|
||||
|
||||
SetFrame(NULL);
|
||||
SetFrame((wxFrame *) NULL);
|
||||
|
||||
Activate(FALSE);
|
||||
|
||||
@@ -150,7 +150,7 @@ bool DrawingView::OnClose(bool deleteWindow)
|
||||
void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
|
||||
{
|
||||
DrawingDocument *doc = (DrawingDocument *)GetDocument();
|
||||
doc->GetCommandProcessor()->Submit(new DrawingCommand("Cut Last Segment", DOODLE_CUT, doc, NULL));
|
||||
doc->GetCommandProcessor()->Submit(new DrawingCommand((char *) "Cut Last Segment", DOODLE_CUT, doc, (DoodleSegment *) NULL));
|
||||
}
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
|
||||
@@ -230,7 +230,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
|
||||
if (!view)
|
||||
return;
|
||||
|
||||
static DoodleSegment *currentSegment = NULL;
|
||||
static DoodleSegment *currentSegment = (DoodleSegment *) NULL;
|
||||
|
||||
wxClientDC dc(this);
|
||||
PrepareDC(dc);
|
||||
@@ -244,7 +244,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
|
||||
if (currentSegment->lines.Number() == 0)
|
||||
{
|
||||
delete currentSegment;
|
||||
currentSegment = NULL;
|
||||
currentSegment = (DoodleSegment *) NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -254,7 +254,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
|
||||
doc->GetCommandProcessor()->Submit(new DrawingCommand("Add Segment", DOODLE_ADD, doc, currentSegment));
|
||||
|
||||
view->GetDocument()->Modify(TRUE);
|
||||
currentSegment = NULL;
|
||||
currentSegment = (DoodleSegment *) NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -46,12 +46,12 @@ class DrawingView: public wxView
|
||||
wxFrame *frame;
|
||||
MyCanvas *canvas;
|
||||
|
||||
DrawingView(void) { canvas = NULL; frame = NULL; };
|
||||
DrawingView(void) { canvas = (MyCanvas *) NULL; frame = (wxFrame *) NULL; };
|
||||
~DrawingView(void) {};
|
||||
|
||||
bool OnCreate(wxDocument *doc, long flags);
|
||||
void OnDraw(wxDC *dc);
|
||||
void OnUpdate(wxView *sender, wxObject *hint = NULL);
|
||||
void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
|
||||
bool OnClose(bool deleteWindow = TRUE);
|
||||
|
||||
void OnCut(wxCommandEvent& event);
|
||||
@@ -67,12 +67,12 @@ class TextEditView: public wxView
|
||||
wxFrame *frame;
|
||||
MyTextWindow *textsw;
|
||||
|
||||
TextEditView(wxDocument *doc = NULL): wxView(doc) { frame = NULL; textsw = NULL; }
|
||||
TextEditView(wxDocument *doc = (wxDocument *) NULL): wxView(doc) { frame = (wxFrame *) NULL; textsw = (MyTextWindow *) NULL; }
|
||||
~TextEditView(void) {}
|
||||
|
||||
bool OnCreate(wxDocument *doc, long flags);
|
||||
void OnDraw(wxDC *dc);
|
||||
void OnUpdate(wxView *sender, wxObject *hint = NULL);
|
||||
void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
|
||||
bool OnClose(bool deleteWindow = TRUE);
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user