moved Destroy() to the beginning

[wxWidgets.git] / samples / minifram / test.cpp

diff --git a/samples/minifram/test.cpp b/samples/minifram/test.cpp
index a6d0889355a97ac2b5b086aab53d6620328b7cce..7cb4e05da5785b13993b628fcbd282d856cd8541 100644 (file)
--- a/samples/minifram/test.cpp
+++ b/samples/minifram/test.cpp
@@ -53,17 +53,17 @@ bool MyApp::OnInit(void)
 {
   // Create the mini frame window
   mini_frame = new MyMiniFrame((wxFrame *) NULL, -1, "wxMiniFrame sample",
 {
   // Create the mini frame window
   mini_frame = new MyMiniFrame((wxFrame *) NULL, -1, "wxMiniFrame sample",

-     wxPoint(100, 100), wxSize(205, 100));
+     wxPoint(100, 100), wxSize(220, 100));

   mini_frame_exists = TRUE;
 
   mini_frame_exists = TRUE;
 

-  mini_frame->CreateToolBar(wxNO_BORDER|wxHORIZONTAL|wxTB_FLAT, ID_TOOLBAR);
+  mini_frame->CreateToolBar(wxNO_BORDER|wxTB_HORIZONTAL|wxTB_FLAT, ID_TOOLBAR);

   InitToolbar(mini_frame->GetToolBar());
   
   // Create the main frame window
   main_frame = new MyMainFrame((wxFrame *) NULL, -1, "wxFrame sample",
      wxPoint(100, 100), wxSize(300, 200));
      
   InitToolbar(mini_frame->GetToolBar());
   
   // Create the main frame window
   main_frame = new MyMainFrame((wxFrame *) NULL, -1, "wxFrame sample",
      wxPoint(100, 100), wxSize(300, 200));
      

-  main_frame->CreateToolBar(wxNO_BORDER|wxHORIZONTAL, ID_TOOLBAR);
+  main_frame->CreateToolBar(wxNO_BORDER|wxTB_VERTICAL, ID_TOOLBAR);

   InitToolbar(main_frame->GetToolBar());
   
   button = new wxButton( main_frame, ID_REPARENT, "Press to reparent!" );
   InitToolbar(main_frame->GetToolBar());
   
   button = new wxButton( main_frame, ID_REPARENT, "Press to reparent!" );


@@ -133,7 +133,7 @@ bool MyApp::InitToolbar(wxToolBar* toolBar)
   toolBar->AddTool(wxID_PASTE, *(toolBarBitmaps[5]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Paste");
   currentX += width + 5;
   toolBar->AddSeparator();
   toolBar->AddTool(wxID_PASTE, *(toolBarBitmaps[5]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Paste");
   currentX += width + 5;
   toolBar->AddSeparator();

-  toolBar->AddTool(wxID_PRINT, *(toolBarBitmaps[6]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Print");
+  toolBar->AddTool(wxID_PRINT, *(toolBarBitmaps[6]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Reparent the button");

   currentX += width + 5;
   toolBar->AddSeparator();
   toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Help");
   currentX += width + 5;
   toolBar->AddSeparator();
   toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Help");


@@ -155,6 +155,7 @@ bool MyApp::InitToolbar(wxToolBar* toolBar)
 BEGIN_EVENT_TABLE(MyMiniFrame, wxMiniFrame)
     EVT_CLOSE  (              MyMiniFrame::OnCloseWindow)
     EVT_BUTTON (ID_REPARENT,  MyMiniFrame::OnReparent)
 BEGIN_EVENT_TABLE(MyMiniFrame, wxMiniFrame)
     EVT_CLOSE  (              MyMiniFrame::OnCloseWindow)
     EVT_BUTTON (ID_REPARENT,  MyMiniFrame::OnReparent)

+    EVT_MENU   (wxID_PRINT,   MyMiniFrame::OnReparent)

 END_EVENT_TABLE()
 
 MyMiniFrame::MyMiniFrame(wxFrame* parent, wxWindowID id, const wxString& title, const wxPoint& pos,
 END_EVENT_TABLE()
 
 MyMiniFrame::MyMiniFrame(wxFrame* parent, wxWindowID id, const wxString& title, const wxPoint& pos,


@@ -180,6 +181,7 @@ void MyMiniFrame::OnReparent(wxCommandEvent& WXUNUSED(event))
 BEGIN_EVENT_TABLE(MyMainFrame, wxFrame)
     EVT_CLOSE  (              MyMainFrame::OnCloseWindow)
     EVT_BUTTON (ID_REPARENT,  MyMainFrame::OnReparent)
 BEGIN_EVENT_TABLE(MyMainFrame, wxFrame)
     EVT_CLOSE  (              MyMainFrame::OnCloseWindow)
     EVT_BUTTON (ID_REPARENT,  MyMainFrame::OnReparent)

+    EVT_MENU   (wxID_PRINT,   MyMainFrame::OnReparent)

 END_EVENT_TABLE()
 
 MyMainFrame::MyMainFrame(wxFrame* parent, wxWindowID id, const wxString& title, const wxPoint& pos,
 END_EVENT_TABLE()
 
 MyMainFrame::MyMainFrame(wxFrame* parent, wxWindowID id, const wxString& title, const wxPoint& pos,