1. demo of status bar at the top in statbar

2. kbd accels added to splitter

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/dynamic/minimal.cpp b/samples/dynamic/minimal.cpp
deleted file mode 100644 (file)
index 354d3aa..0000000
--- a/samples/dynamic/minimal.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        minimal.cpp
-// Purpose:     Dynamic events wxWindows sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "minimal.cpp"
-#pragma interface "minimal.cpp"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#ifdef __WXGTK__
-#include "mondrian.xpm"
-#endif
-
-// Define a new application type
-class MyApp: public wxApp
-{ public:
-    bool OnInit(void);
-};
-
-// Define a new frame type
-class MyFrame: public wxFrame
-{ public:
-    MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
-    
- public:
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-       bool OnClose(void) { return TRUE; }
-};
-
-// ID for the menu commands
-#define MINIMAL_QUIT   1
-#define MINIMAL_TEXT   101
-#define MINIMAL_ABOUT  102
-
-// Create a new application object
-IMPLEMENT_APP  (MyApp)
-
-// `Main program' equivalent, creating windows and returning main app frame
-bool MyApp::OnInit(void)
-{
-  // Create the main frame window
-  MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "Minimal wxWindows App", 50, 50, 450, 340);
-  
-  frame->Connect( MINIMAL_QUIT,  -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)MyFrame::OnQuit );
-  frame->Connect( MINIMAL_ABOUT, -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)MyFrame::OnAbout );
-  
-  // Give it an icon
-#ifdef __WXMSW__
-  frame->SetIcon(wxIcon("mondrian"));
-#else
-  frame->SetIcon(wxIcon(mondrian_xpm));
-#endif
-
-  // Make a menubar
-  wxMenu *file_menu = new wxMenu;
-
-  file_menu->Append(MINIMAL_ABOUT, "&About");
-  file_menu->Append(MINIMAL_QUIT, "E&xit");
-  wxMenuBar *menu_bar = new wxMenuBar;
-  menu_bar->Append(file_menu, "&File");
-  frame->SetMenuBar(menu_bar);
-
-  // Make a panel with a message
-  wxPanel *panel = new wxPanel(frame, -1, wxPoint(0, 0), wxSize(400, 200), wxTAB_TRAVERSAL);
-
-  (void)new wxStaticText(panel, 311, "Hello!", wxPoint(10, 10), wxSize(-1, -1), 0);
-
-  // Show the frame
-  frame->Show(TRUE);
-  
-  SetTopWindow(frame);
-
-  return TRUE;
-}
-
-// My frame constructor
-MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
-  wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
-{}
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
-{
-  Close(TRUE);
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
-{
-  wxMessageDialog dialog(this, "This is a minimal sample\nA second line in the message box",
-       "About Minimal", wxYES_NO|wxCANCEL);
-
-  dialog.ShowModal();
-}
-
-

diff --git a/samples/splitter/test.cpp b/samples/splitter/test.cpp
index d443b1ad6728e47daa9669a031147a256c0aa675..c97351eb8dd1a6ebb4fe0721759bb6487dde13b5 100644 (file)
--- a/samples/splitter/test.cpp
+++ b/samples/splitter/test.cpp
@@ -152,13 +152,13 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
 
   // Make a menubar
   fileMenu = new wxMenu;
 
   // Make a menubar
   fileMenu = new wxMenu;

-  fileMenu->Append(SPLIT_VERTICAL, "Split &Vertically", "Split vertically");
-  fileMenu->Append(SPLIT_HORIZONTAL, "Split &Horizontally", "Split horizontally");
-  fileMenu->Append(SPLIT_UNSPLIT, "&Unsplit", "Unsplit");
+  fileMenu->Append(SPLIT_VERTICAL, "Split &Vertically\tCtrl-V", "Split vertically");
+  fileMenu->Append(SPLIT_HORIZONTAL, "Split &Horizontally\tCtrl-H", "Split horizontally");
+  fileMenu->Append(SPLIT_UNSPLIT, "&Unsplit\tCtrl-U", "Unsplit");

   fileMenu->AppendSeparator();
   fileMenu->Append(SPLIT_SETMINSIZE, "Set &min size", "Set minimum pane size");
   fileMenu->AppendSeparator();
   fileMenu->AppendSeparator();
   fileMenu->Append(SPLIT_SETMINSIZE, "Set &min size", "Set minimum pane size");
   fileMenu->AppendSeparator();

-  fileMenu->Append(SPLIT_QUIT, "E&xit", "Exit");
+  fileMenu->Append(SPLIT_QUIT, "E&xit\tAlt-X", "Exit");

 
   menuBar = new wxMenuBar;
   menuBar->Append(fileMenu, "&File");
 
   menuBar = new wxMenuBar;
   menuBar->Append(fileMenu, "&File");

diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index 6ff9fa9533d8d70605e3f1683095bbaea6668f09..52e4f5d0373b73571c2187291d14d428e3515d52 100644 (file)
--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@@ -370,16 +370,25 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent)
                                           "wxStatusBar sample\n"
                                           "(c) 2000 Vadim Zeitlin");
 
                                           "wxStatusBar sample\n"
                                           "(c) 2000 Vadim Zeitlin");
 

-    wxStatusBar *statbar = new wxStatusBar(this, -1);
-    statbar->SetFieldsCount(2);
-    statbar->SetStatusText("This is a status bar", 0);
-    statbar->SetStatusText("in a dialog", 1);
+    // create the top status bar without the size grip (default style),
+    // otherwise it looks weird
+    wxStatusBar *statbarTop = new wxStatusBar(this, -1, 0);
+    statbarTop->SetFieldsCount(3);
+    statbarTop->SetStatusText("This is a top status bar", 0);
+    statbarTop->SetStatusText("in a dialog", 1);
+    statbarTop->SetStatusText("Great, isn't it?", 2);
+
+    wxStatusBar *statbarBottom = new wxStatusBar(this, -1);
+    statbarBottom->SetFieldsCount(2);
+    statbarBottom->SetStatusText("This is a bottom status bar", 0);
+    statbarBottom->SetStatusText("in a dialog", 1);

 
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
 
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);

+    sizerTop->Add(statbarTop, 0, wxGROW);

     sizerTop->Add(-1, 10, 1, wxGROW);
     sizerTop->Add(text, 0, wxCENTRE);
     sizerTop->Add(-1, 10, 1, wxGROW);
     sizerTop->Add(-1, 10, 1, wxGROW);
     sizerTop->Add(text, 0, wxCENTRE);
     sizerTop->Add(-1, 10, 1, wxGROW);

-    sizerTop->Add(statbar, 0, wxGROW);
+    sizerTop->Add(statbarBottom, 0, wxGROW);

 
     SetAutoLayout(TRUE);
     SetSizer(sizerTop);
 
     SetAutoLayout(TRUE);
     SetSizer(sizerTop);