Forgot to add this one

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

diff --git a/samples/minifram/test.cpp b/samples/minifram/test.cpp
index 147099690160ea2e51a874295aa839ed68127c59..1906176c68899978177f559f4ae46d62f07dc480 100644 (file)
--- a/samples/minifram/test.cpp
+++ b/samples/minifram/test.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Robert Roebling
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -49,25 +49,25 @@ wxButton      *button     = (wxButton*) NULL;
 
 // The `main program' equivalent, creating the windows and returning the
 // main frame
 
 // The `main program' equivalent, creating the windows and returning the
 // main frame

-bool MyApp::OnInit(void)
+bool MyApp::OnInit()

 {
 {

-  // Create the mini frame window
-  mini_frame = new MyMiniFrame((wxFrame *) NULL, -1, "wxMiniFrame sample",
-     wxPoint(100, 100), wxSize(205, 100));
-  mini_frame_exists = TRUE;
-
-  mini_frame->CreateToolBar(wxNO_BORDER|wxHORIZONTAL|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));
   // 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());
   InitToolbar(main_frame->GetToolBar());

-  
+

   button = new wxButton( main_frame, ID_REPARENT, "Press to reparent!" );
 
   button = new wxButton( main_frame, ID_REPARENT, "Press to reparent!" );
 

+  // Create the mini frame window
+  mini_frame = new MyMiniFrame( main_frame, -1, "wxMiniFrame sample",
+     wxPoint(100, 100), wxSize(220, 100));
+  mini_frame_exists = TRUE;
+
+  mini_frame->CreateToolBar(wxNO_BORDER|wxTB_HORIZONTAL|wxTB_FLAT, ID_TOOLBAR);
+  InitToolbar(mini_frame->GetToolBar());
+

 #ifdef __WXMSW__
   main_frame->SetIcon(wxIcon("mondrian"));
   mini_frame->SetIcon(wxIcon("mondrian"));
 #ifdef __WXMSW__
   main_frame->SetIcon(wxIcon("mondrian"));
   mini_frame->SetIcon(wxIcon("mondrian"));


@@ -77,7 +77,7 @@ bool MyApp::OnInit(void)
 #endif
 
   SetTopWindow(main_frame);
 #endif
 
   SetTopWindow(main_frame);

-  
+

   main_frame->Show(TRUE);
   mini_frame->Show(TRUE);
 
   main_frame->Show(TRUE);
   mini_frame->Show(TRUE);
 


@@ -139,7 +139,7 @@ bool MyApp::InitToolbar(wxToolBar* toolBar)
   toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Help");
 
   toolBar->Realize();
   toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Help");
 
   toolBar->Realize();

-  
+

   toolBar->EnableTool( wxID_HELP, FALSE );
 
   // Can delete the bitmaps since they're reference counted
   toolBar->EnableTool( wxID_HELP, FALSE );
 
   // Can delete the bitmaps since they're reference counted


@@ -201,8 +201,8 @@ void MyMainFrame::OnReparent(wxCommandEvent& WXUNUSED(event))
   // after closing the mini_frame. We'll have the last laugh.
   if (! mini_frame_exists)
     wxMessageBox("The miniframe no longer exists.\n"
   // after closing the mini_frame. We'll have the last laugh.
   if (! mini_frame_exists)
     wxMessageBox("The miniframe no longer exists.\n"

-       "You don't want to make this button an orphan, do you?",
-       "You got to be kidding");
+                 "You don't want to make this button an orphan, do you?",
+                 "You got to be kidding");

   else
     button->Reparent( mini_frame );
 }
   else
     button->Reparent( mini_frame );
 }