X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd7d06f23d25df834c30d386dcf3b561c4c79a27..3ad5e06b4aefdcef8a1ec2ec563540e055462e66:/samples/layout/layout.cpp?ds=inline

diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index 1e660df2ac..ab66c79b01 100644
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -20,23 +20,19 @@
 #include "wx/wx.h"
 #endif
 
-#if !USE_CONSTRAINTS
-#error You must set USE_CONSTRAINTS to 1 in wx_setup.h!
+#if !wxUSE_CONSTRAINTS
+#error You must set wxUSE_CONSTRAINTS to 1 in wx_setup.h!
 #endif
 
 #include <ctype.h>
 #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)
 
-#ifdef __X__
-#include "aiai.xbm"
-#endif
-
 MyApp::MyApp()
 {
 }
@@ -44,21 +40,13 @@ 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);
 
   // Give it a status line
   frame->CreateStatusBar(2);
 
-  // Load icon and bitmap
-#ifdef __WXMSW__
-  frame->SetIcon(wxIcon("aiai_icn"));
-#endif
-#ifdef __X__
-  frame->SetIcon(wxIcon(aiai_bits, aiai_width, aiai_height));
-#endif
-
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
@@ -168,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)
@@ -183,8 +171,8 @@ END_EVENT_TABLE()
 
 void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) )
 {
-      char *s = wxFileSelector("Load text file", NULL, NULL, NULL, "*.txt");
-      if (s)
+      wxString s = wxFileSelector("Load text file", (const char *) NULL, (const char *) NULL, (const char *) NULL, "*.txt");
+      if (s != "")
       {
 #ifdef __WXMSW__
         frame->text_window->LoadFile(s);
@@ -199,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);
 }
 
@@ -217,12 +205,12 @@ void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event) )
 
 void MyFrame::Draw(wxDC& dc, bool WXUNUSED(draw_bitmaps) )
 {
-  dc.SetPen(wxGREEN_PEN);
+  dc.SetPen(* wxGREEN_PEN);
   dc.DrawLine(0, 0, 200, 200);
   dc.DrawLine(200, 0, 0, 200);
 
-  dc.SetBrush(wxCYAN_BRUSH);
-  dc.SetPen(wxRED_PEN);
+  dc.SetBrush(* wxCYAN_BRUSH);
+  dc.SetPen(* wxRED_PEN);
 
   dc.DrawRectangle(100, 100, 100, 50);
   dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
@@ -231,7 +219,7 @@ void MyFrame::Draw(wxDC& dc, bool WXUNUSED(draw_bitmaps) )
   dc.DrawSpline(50, 200, 50, 100, 200, 10);
   dc.DrawLine(50, 230, 200, 230);
 
-  dc.SetPen(wxBLACK_PEN);
+  dc.SetPen(* wxBLACK_PEN);
   dc.DrawArc(50, 300, 100, 250, 100, 300 );
 }
 
@@ -256,14 +244,6 @@ void MyWindow::OnPaint(wxPaintEvent& WXUNUSED(event) )
   frame->Draw(dc,TRUE);
 }
 
-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-bool MyFrame::OnClose(void)
-{
-  Show(FALSE);
-
-  return TRUE;
-}
 
 SizerFrame::SizerFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
   wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
@@ -358,10 +338,3 @@ void SizerFrame::OnSize(wxSizeEvent& event)
   panel->Layout();
 }
 
-bool SizerFrame::OnClose(void)
-{
-  Show(FALSE);
-
-  return TRUE;
-}
-