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

16
samples/layout/layout.cpp
View File

@@ -28,8 +28,8 @@
#include "layout.h"
// Declare two frames
MyFrame *frame = NULL;
wxMenuBar *menu_bar = NULL;
MyFrame *frame = (MyFrame *) NULL;
wxMenuBar *menu_bar = (wxMenuBar *) NULL;
IMPLEMENT_APP(MyApp)
@@ -40,7 +40,7 @@ MyApp::MyApp()
bool MyApp::OnInit(void)
{
// Create the main frame window
frame = new MyFrame(NULL, "wxWindows Layout Demo", 0, 0, 550, 500);
frame = new MyFrame((MyFrame *) NULL, (char *) "wxWindows Layout Demo", 0, 0, 550, 500);
frame->SetAutoLayout(TRUE);
@@ -156,9 +156,9 @@ bool MyApp::OnInit(void)
MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
{
panel = NULL;
text_window = NULL;
canvas = NULL;
panel = (wxPanel *) NULL;
text_window = (MyTextWindow *) NULL;
canvas = (MyWindow *) NULL;
}
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -171,7 +171,7 @@ END_EVENT_TABLE()
void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) )
{
char *s = wxFileSelector("Load text file", NULL, NULL, NULL, "*.txt");
char *s = wxFileSelector("Load text file", (const char *) NULL, (const char *) NULL, (const char *) NULL, "*.txt");
if (s)
{
#ifdef __WXMSW__
@@ -187,7 +187,7 @@ void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) )
void MyFrame::TestSizers(wxCommandEvent& WXUNUSED(event) )
{
SizerFrame *newFrame = new SizerFrame(NULL, "Sizer Test Frame", 50, 50, 500, 500);
SizerFrame *newFrame = new SizerFrame((MyFrame *) NULL, (char *) "Sizer Test Frame", 50, 50, 500, 500);
newFrame->Show(TRUE);
}