Correct 'markup' for GetResourceHandle after recent change in wx/gdiobj.h.

[wxWidgets.git] / samples / aui / auidemo.cpp

diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
index 44e127782dfd21a12d70541d6522488763d5a875..a3b1331d44d0348a29c2164df74cabe9053e5828 100644 (file)
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -16,8 +16,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/wx.h"
-
+#include "wx/app.h"

 #include "wx/grid.h"
 #include "wx/treectrl.h"
 #include "wx/spinctrl.h"
 #include "wx/grid.h"
 #include "wx/treectrl.h"
 #include "wx/spinctrl.h"


@@ -28,6 +27,13 @@
 #include "wx/wxhtml.h"
 #include "wx/imaglist.h"
 #include "wx/dataobj.h"
 #include "wx/wxhtml.h"
 #include "wx/imaglist.h"
 #include "wx/dataobj.h"

+#include "wx/dcclient.h"
+#include "wx/bmpbuttn.h"
+#include "wx/menu.h"
+#include "wx/toolbar.h"
+#include "wx/statusbr.h"
+#include "wx/msgdlg.h"
+#include "wx/textdlg.h"

 
 #include "wx/aui/aui.h"
 #include "../sample.xpm"
 
 #include "wx/aui/aui.h"
 #include "../sample.xpm"


@@ -61,6 +67,7 @@ class MyFrame : public wxFrame
         ID_TextContent,
         ID_TreeContent,
         ID_HTMLContent,
         ID_TextContent,
         ID_TreeContent,
         ID_HTMLContent,

+        ID_NotebookContent,

         ID_SizeReportContent,
         ID_CreatePerspective,
         ID_CopyPerspectiveCode,
         ID_SizeReportContent,
         ID_CreatePerspective,
         ID_CopyPerspectiveCode,


@@ -68,6 +75,8 @@ class MyFrame : public wxFrame
         ID_AllowActivePane,
         ID_TransparentHint,
         ID_TransparentHintFade,
         ID_AllowActivePane,
         ID_TransparentHint,
         ID_TransparentHintFade,

+        ID_DisableVenetian,
+        ID_DisableVenetianFade,

         ID_TransparentDrag,
         ID_NoGradient,
         ID_VerticalGradient,
         ID_TransparentDrag,
         ID_NoGradient,
         ID_VerticalGradient,


@@ -96,6 +105,7 @@ private:
     wxSizeReportCtrl* CreateSizeReportCtrl(int width = 80, int height = 80);
     wxPoint GetStartPosition();
     wxHtmlWindow* CreateHTMLCtrl();
     wxSizeReportCtrl* CreateSizeReportCtrl(int width = 80, int height = 80);
     wxPoint GetStartPosition();
     wxHtmlWindow* CreateHTMLCtrl();

+    wxAuiMultiNotebook* CreateNotebook();

 
     wxString GetIntroText();
 
 
     wxString GetIntroText();
 


@@ -107,6 +117,7 @@ private:
     void OnCreateTree(wxCommandEvent& evt);
     void OnCreateGrid(wxCommandEvent& evt);
     void OnCreateHTML(wxCommandEvent& evt);
     void OnCreateTree(wxCommandEvent& evt);
     void OnCreateGrid(wxCommandEvent& evt);
     void OnCreateHTML(wxCommandEvent& evt);

+    void OnCreateNotebook(wxCommandEvent& evt);

     void OnCreateText(wxCommandEvent& evt);
     void OnCreateSizeReport(wxCommandEvent& evt);
     void OnChangeContentPane(wxCommandEvent& evt);
     void OnCreateText(wxCommandEvent& evt);
     void OnCreateSizeReport(wxCommandEvent& evt);
     void OnChangeContentPane(wxCommandEvent& evt);


@@ -133,7 +144,6 @@ private:
 };
 
 
 };
 
 

-

 // -- wxSizeReportCtrl --
 // (a utility control that always reports it's client size)
 
 // -- wxSizeReportCtrl --
 // (a utility control that always reports it's client size)
 


@@ -217,10 +227,6 @@ BEGIN_EVENT_TABLE(wxSizeReportCtrl, wxControl)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-
-
-
-

 class SettingsPanel : public wxPanel
 {
     enum
 class SettingsPanel : public wxPanel
 {
     enum


@@ -520,16 +526,11 @@ BEGIN_EVENT_TABLE(SettingsPanel, wxPanel)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-
-
-
-
-

 bool MyApp::OnInit()
 {
     wxFrame* frame = new MyFrame(NULL,
                                  wxID_ANY,
 bool MyApp::OnInit()
 {
     wxFrame* frame = new MyFrame(NULL,
                                  wxID_ANY,

-                                 wxT("wxAUI 0.9.2 Test Application"),
+                                 wxT("wxAUI Sample Application"),

                                  wxDefaultPosition,
                                  wxSize(800, 600));
     SetTopWindow(frame);
                                  wxDefaultPosition,
                                  wxSize(800, 600));
     SetTopWindow(frame);


@@ -538,8 +539,6 @@ bool MyApp::OnInit()
     return true;
 }
 
     return true;
 }
 

-
-

 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_ERASE_BACKGROUND(MyFrame::OnEraseBackground)
     EVT_SIZE(MyFrame::OnSize)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_ERASE_BACKGROUND(MyFrame::OnEraseBackground)
     EVT_SIZE(MyFrame::OnSize)


@@ -553,6 +552,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(ID_AllowFloating, MyFrame::OnManagerFlag)
     EVT_MENU(ID_TransparentHint, MyFrame::OnManagerFlag)
     EVT_MENU(ID_TransparentHintFade, MyFrame::OnManagerFlag)
     EVT_MENU(ID_AllowFloating, MyFrame::OnManagerFlag)
     EVT_MENU(ID_TransparentHint, MyFrame::OnManagerFlag)
     EVT_MENU(ID_TransparentHintFade, MyFrame::OnManagerFlag)

+    EVT_MENU(ID_DisableVenetian, MyFrame::OnManagerFlag)
+    EVT_MENU(ID_DisableVenetianFade, MyFrame::OnManagerFlag)

     EVT_MENU(ID_TransparentDrag, MyFrame::OnManagerFlag)
     EVT_MENU(ID_AllowActivePane, MyFrame::OnManagerFlag)
     EVT_MENU(ID_NoGradient, MyFrame::OnGradient)
     EVT_MENU(ID_TransparentDrag, MyFrame::OnManagerFlag)
     EVT_MENU(ID_AllowActivePane, MyFrame::OnManagerFlag)
     EVT_MENU(ID_NoGradient, MyFrame::OnGradient)


@@ -564,11 +565,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(ID_TextContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_SizeReportContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_HTMLContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_TextContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_SizeReportContent, MyFrame::OnChangeContentPane)
     EVT_MENU(ID_HTMLContent, MyFrame::OnChangeContentPane)

+    EVT_MENU(ID_NotebookContent, MyFrame::OnChangeContentPane)

     EVT_MENU(wxID_EXIT, MyFrame::OnExit)
     EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
     EVT_UPDATE_UI(ID_AllowFloating, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_TransparentHint, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_TransparentHintFade, MyFrame::OnUpdateUI)
     EVT_MENU(wxID_EXIT, MyFrame::OnExit)
     EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
     EVT_UPDATE_UI(ID_AllowFloating, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_TransparentHint, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_TransparentHintFade, MyFrame::OnUpdateUI)

+    EVT_UPDATE_UI(ID_DisableVenetian, MyFrame::OnUpdateUI)
+    EVT_UPDATE_UI(ID_DisableVenetianFade, MyFrame::OnUpdateUI)

     EVT_UPDATE_UI(ID_TransparentDrag, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_NoGradient, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_VerticalGradient, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_TransparentDrag, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_NoGradient, MyFrame::OnUpdateUI)
     EVT_UPDATE_UI(ID_VerticalGradient, MyFrame::OnUpdateUI)


@@ -579,7 +583,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-

 MyFrame::MyFrame(wxWindow* parent,
                  wxWindowID id,
                  const wxString& title,
 MyFrame::MyFrame(wxWindow* parent,
                  wxWindowID id,
                  const wxString& title,


@@ -611,12 +614,15 @@ MyFrame::MyFrame(wxWindow* parent,
     view_menu->Append(ID_TextContent, _("Use a Text Control for the Content Pane"));
     view_menu->Append(ID_HTMLContent, _("Use an HTML Control for the Content Pane"));
     view_menu->Append(ID_TreeContent, _("Use a Tree Control for the Content Pane"));
     view_menu->Append(ID_TextContent, _("Use a Text Control for the Content Pane"));
     view_menu->Append(ID_HTMLContent, _("Use an HTML Control for the Content Pane"));
     view_menu->Append(ID_TreeContent, _("Use a Tree Control for the Content Pane"));

+    view_menu->Append(ID_NotebookContent, _("Use a AUI wxMultiNotebook control for the Content Pane"));

     view_menu->Append(ID_SizeReportContent, _("Use a Size Reporter for the Content Pane"));
 
     wxMenu* options_menu = new wxMenu;
     options_menu->AppendCheckItem(ID_AllowFloating, _("Allow Floating"));
     options_menu->AppendCheckItem(ID_TransparentHint, _("Transparent Hint"));
     options_menu->AppendCheckItem(ID_TransparentHintFade, _("Transparent Hint Fade-in"));
     view_menu->Append(ID_SizeReportContent, _("Use a Size Reporter for the Content Pane"));
 
     wxMenu* options_menu = new wxMenu;
     options_menu->AppendCheckItem(ID_AllowFloating, _("Allow Floating"));
     options_menu->AppendCheckItem(ID_TransparentHint, _("Transparent Hint"));
     options_menu->AppendCheckItem(ID_TransparentHintFade, _("Transparent Hint Fade-in"));

+    options_menu->AppendCheckItem(ID_DisableVenetian, _("Disable Venetian Blinds Hint"));
+    options_menu->AppendCheckItem(ID_DisableVenetianFade, _("Disable Venetian Blinds Hint Fade-in"));

     options_menu->AppendCheckItem(ID_TransparentDrag, _("Transparent Drag"));
     options_menu->AppendCheckItem(ID_AllowActivePane, _("Allow Active Pane"));
     options_menu->AppendSeparator();
     options_menu->AppendCheckItem(ID_TransparentDrag, _("Transparent Drag"));
     options_menu->AppendCheckItem(ID_AllowActivePane, _("Allow Active Pane"));
     options_menu->AppendSeparator();


@@ -666,7 +672,6 @@ MyFrame::MyFrame(wxWindow* parent,
     tb1->Realize();
 
 
     tb1->Realize();
 
 

-

     wxToolBar* tb2 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                                    wxTB_FLAT | wxTB_NODIVIDER);
     tb2->SetToolBitmapSize(wxSize(16,16));
     wxToolBar* tb2 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                                    wxTB_FLAT | wxTB_NODIVIDER);
     tb2->SetToolBitmapSize(wxSize(16,16));


@@ -701,7 +706,6 @@ MyFrame::MyFrame(wxWindow* parent,
     tb3->Realize();
 
 
     tb3->Realize();
 
 

-

     wxToolBar* tb4 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                                    wxTB_FLAT | wxTB_NODIVIDER | wxTB_HORZ_TEXT);
     tb4->SetToolBitmapSize(wxSize(16,16));
     wxToolBar* tb4 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                                    wxTB_FLAT | wxTB_NODIVIDER | wxTB_HORZ_TEXT);
     tb4->SetToolBitmapSize(wxSize(16,16));


@@ -799,6 +803,9 @@ MyFrame::MyFrame(wxWindow* parent,
     m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().Name(wxT("html_content")).
                   CenterPane());
 
     m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().Name(wxT("html_content")).
                   CenterPane());
 

+    m_mgr.AddPane(CreateNotebook(), wxPaneInfo().Name(wxT("notebook_content")).
+                  CenterPane().PaneBorder(false));
+

     // add the toolbars to the manager
 
     m_mgr.AddPane(tb1, wxPaneInfo().
     // add the toolbars to the manager
 
     m_mgr.AddPane(tb1, wxPaneInfo().


@@ -871,7 +878,6 @@ void MyFrame::DoUpdate()
     m_mgr.Update();
 }
 
     m_mgr.Update();
 }
 

-

 void MyFrame::OnEraseBackground(wxEraseEvent& event)
 {
     event.Skip();
 void MyFrame::OnEraseBackground(wxEraseEvent& event)
 {
     event.Skip();


@@ -893,7 +899,6 @@ void MyFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
     m_mgr.Update();
 }
 
     m_mgr.Update();
 }
 

-

 void MyFrame::OnGradient(wxCommandEvent& event)
 {
     int gradient = 0;
 void MyFrame::OnGradient(wxCommandEvent& event)
 {
     int gradient = 0;


@@ -929,6 +934,8 @@ void MyFrame::OnManagerFlag(wxCommandEvent& event)
         case ID_TransparentDrag: flag = wxAUI_MGR_TRANSPARENT_DRAG; break;
         case ID_TransparentHint: flag = wxAUI_MGR_TRANSPARENT_HINT; break;
         case ID_TransparentHintFade: flag = wxAUI_MGR_TRANSPARENT_HINT_FADE; break;
         case ID_TransparentDrag: flag = wxAUI_MGR_TRANSPARENT_DRAG; break;
         case ID_TransparentHint: flag = wxAUI_MGR_TRANSPARENT_HINT; break;
         case ID_TransparentHintFade: flag = wxAUI_MGR_TRANSPARENT_HINT_FADE; break;

+        case ID_DisableVenetian: flag = wxAUI_MGR_DISABLE_VENETIAN_BLINDS; break;
+        case ID_DisableVenetianFade: flag = wxAUI_MGR_DISABLE_VENETIAN_BLINDS_FADE; break;

         case ID_AllowActivePane: flag = wxAUI_MGR_ALLOW_ACTIVE_PANE; break;
     }
     m_mgr.SetFlags(m_mgr.GetFlags() ^ flag);
         case ID_AllowActivePane: flag = wxAUI_MGR_ALLOW_ACTIVE_PANE; break;
     }
     m_mgr.SetFlags(m_mgr.GetFlags() ^ flag);


@@ -942,25 +949,31 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
     switch (event.GetId())
     {
         case ID_NoGradient:
     switch (event.GetId())
     {
         case ID_NoGradient:

-            event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_NONE ? true : false);
+            event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_NONE);

             break;
         case ID_VerticalGradient:
             break;
         case ID_VerticalGradient:

-            event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_VERTICAL ? true : false);
+            event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_VERTICAL);

             break;
         case ID_HorizontalGradient:
             break;
         case ID_HorizontalGradient:

-            event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_HORIZONTAL ? true : false);
+            event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_HORIZONTAL);

             break;
         case ID_AllowFloating:
             break;
         case ID_AllowFloating:

-            event.Check(flags & wxAUI_MGR_ALLOW_FLOATING ? true : false);
+            event.Check((flags & wxAUI_MGR_ALLOW_FLOATING) != 0);

             break;
         case ID_TransparentDrag:
             break;
         case ID_TransparentDrag:

-            event.Check(flags & wxAUI_MGR_TRANSPARENT_DRAG ? true : false);
+            event.Check((flags & wxAUI_MGR_TRANSPARENT_DRAG) != 0);

             break;
         case ID_TransparentHint:
             break;
         case ID_TransparentHint:

-            event.Check(flags & wxAUI_MGR_TRANSPARENT_HINT ? true : false);
+            event.Check((flags & wxAUI_MGR_TRANSPARENT_HINT) != 0);

             break;
         case ID_TransparentHintFade:
             break;
         case ID_TransparentHintFade:

-            event.Check(flags & wxAUI_MGR_TRANSPARENT_HINT_FADE ? true : false);
+            event.Check((flags & wxAUI_MGR_TRANSPARENT_HINT_FADE) != 0);
+            break;
+        case ID_DisableVenetian:
+            event.Check((flags & wxAUI_MGR_DISABLE_VENETIAN_BLINDS) != 0);
+            break;
+        case ID_DisableVenetianFade:
+            event.Check((flags & wxAUI_MGR_DISABLE_VENETIAN_BLINDS_FADE) != 0);

             break;
     }
 }
             break;
     }
 }


@@ -978,14 +991,12 @@ void MyFrame::OnPaneClose(wxFrameManagerEvent& evt)
     }
 }
 
     }
 }
 

-
-

 void MyFrame::OnCreatePerspective(wxCommandEvent& WXUNUSED(event))
 {
     wxTextEntryDialog dlg(this, wxT("Enter a name for the new perspective:"),
                           wxT("wxAUI Test"));
 
 void MyFrame::OnCreatePerspective(wxCommandEvent& WXUNUSED(event))
 {
     wxTextEntryDialog dlg(this, wxT("Enter a name for the new perspective:"),
                           wxT("wxAUI Test"));
 

-    dlg.SetValue(wxString::Format(wxT("Perspective %d"), m_perspectives.GetCount()+1));
+    dlg.SetValue(wxString::Format(wxT("Perspective %u"), unsigned(m_perspectives.GetCount() + 1)));

     if (dlg.ShowModal() != wxID_OK)
         return;
 
     if (dlg.ShowModal() != wxID_OK)
         return;
 


@@ -1046,7 +1057,16 @@ void MyFrame::OnCreateGrid(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnCreateHTML(wxCommandEvent& WXUNUSED(event))
 {
     m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().
 void MyFrame::OnCreateHTML(wxCommandEvent& WXUNUSED(event))
 {
     m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().

-                  Name(wxT("Test")).Caption(wxT("Grid")).
+                  Name(wxT("Test")).Caption(wxT("HTML Control")).
+                  Float().FloatingPosition(GetStartPosition()).
+                  FloatingSize(wxSize(300,200)));
+    m_mgr.Update();
+}
+
+void MyFrame::OnCreateNotebook(wxCommandEvent& WXUNUSED(event))
+{
+    m_mgr.AddPane(CreateNotebook(), wxPaneInfo().
+                  Name(wxT("Test")).Caption(wxT("Notebook")).

                   Float().FloatingPosition(GetStartPosition()).
                   FloatingSize(wxSize(300,200)));
     m_mgr.Update();
                   Float().FloatingPosition(GetStartPosition()).
                   FloatingSize(wxSize(300,200)));
     m_mgr.Update();


@@ -1070,11 +1090,12 @@ void MyFrame::OnCreateSizeReport(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnChangeContentPane(wxCommandEvent& event)
 {
 
 void MyFrame::OnChangeContentPane(wxCommandEvent& event)
 {

-    m_mgr.GetPane(wxT("grid_content")).Show(event.GetId() == ID_GridContent ? true:false);
-    m_mgr.GetPane(wxT("text_content")).Show(event.GetId() == ID_TextContent ? true:false);
-    m_mgr.GetPane(wxT("tree_content")).Show(event.GetId() == ID_TreeContent ? true:false);
-    m_mgr.GetPane(wxT("sizereport_content")).Show(event.GetId() == ID_SizeReportContent ? true:false);
-    m_mgr.GetPane(wxT("html_content")).Show(event.GetId() == ID_HTMLContent ? true:false);
+    m_mgr.GetPane(wxT("grid_content")).Show(event.GetId() == ID_GridContent);
+    m_mgr.GetPane(wxT("text_content")).Show(event.GetId() == ID_TextContent);
+    m_mgr.GetPane(wxT("tree_content")).Show(event.GetId() == ID_TreeContent);
+    m_mgr.GetPane(wxT("sizereport_content")).Show(event.GetId() == ID_SizeReportContent);
+    m_mgr.GetPane(wxT("html_content")).Show(event.GetId() == ID_HTMLContent);
+    m_mgr.GetPane(wxT("notebook_content")).Show(event.GetId() == ID_NotebookContent);

     m_mgr.Update();
 }
 
     m_mgr.Update();
 }
 


@@ -1095,7 +1116,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl(const wxString& ctrl_text)
     wxString text;
     if (ctrl_text.Length() > 0)
         text = ctrl_text;
     wxString text;
     if (ctrl_text.Length() > 0)
         text = ctrl_text;

-         else
+    else

         text.Printf(wxT("This is text box %d"), ++n);
 
     return new wxTextCtrl(this,wxID_ANY, text,
         text.Printf(wxT("This is text box %d"), ++n);
 
     return new wxTextCtrl(this,wxID_ANY, text,


@@ -1170,18 +1191,47 @@ wxHtmlWindow* MyFrame::CreateHTMLCtrl()
     return ctrl;
 }
 
     return ctrl;
 }
 

+wxAuiMultiNotebook* MyFrame::CreateNotebook()
+{
+   wxAuiMultiNotebook* ctrl = new wxAuiMultiNotebook( this, wxID_ANY,
+                                    wxDefaultPosition, wxSize(400,300), wxNO_BORDER );
+                                    
+   wxPanel *panel = new wxPanel( ctrl, wxID_ANY );
+   wxFlexGridSizer *flex = new wxFlexGridSizer( 2 );
+   flex->AddGrowableRow( 0 );
+   flex->AddGrowableRow( 3 );
+   flex->AddGrowableCol( 1 );
+   flex->Add( 5,5 );   flex->Add( 5,5 );
+   flex->Add( new wxStaticText( panel, -1, wxT("wxTextCtrl:") ), 0, wxALL|wxALIGN_CENTRE, 5 );
+   flex->Add( new wxTextCtrl( panel, -1, wxT(""), wxDefaultPosition, wxSize(100,-1)), 
+                1, wxALL|wxALIGN_CENTRE, 5 );
+   flex->Add( new wxStaticText( panel, -1, wxT("wxSpinCtrl:") ), 0, wxALL|wxALIGN_CENTRE, 5 );
+   flex->Add( new wxSpinCtrl( panel, -1, wxT("5"), wxDefaultPosition, wxSize(100,-1), 
+                wxSP_ARROW_KEYS, 5, 50, 5 ), 0, wxALL|wxALIGN_CENTRE, 5 );
+   flex->Add( 5,5 );   flex->Add( 5,5 );
+   panel->SetSizer( flex );
+   ctrl->AddPage( panel, wxT("wxPanel") );
+   
+   ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some text"),
+                wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl I") );
+                
+   ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"),
+                wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl II") );
+   
+   return ctrl;
+}

 
 wxString MyFrame::GetIntroText()
 {
     const char* text =
         "<html><body>"
 
 wxString MyFrame::GetIntroText()
 {
     const char* text =
         "<html><body>"

-        "<h3>Welcome to wxAUI 0.9.2</h3>"
+        "<h3>Welcome to wxAUI</h3>"

         "<br/><b>Overview</b><br/>"
         "<p>wxAUI is an Advanced User Interface library for the wxWidgets toolkit "
         "that allows developers to create high-quality, cross-platform user "
         "interfaces quickly and easily.</p>"
         "<p><b>Features</b></p>"
         "<br/><b>Overview</b><br/>"
         "<p>wxAUI is an Advanced User Interface library for the wxWidgets toolkit "
         "that allows developers to create high-quality, cross-platform user "
         "interfaces quickly and easily.</p>"
         "<p><b>Features</b></p>"

-        "<p>With wxAUI version 0.9.2, developers can create application frameworks with:</p>"
+        "<p>With wxAUI, developers can create application frameworks with:</p>"

         "<ul>"
         "<li>Native, dockable floating frames</li>"
         "<li>Perspective saving and loading</li>"
         "<ul>"
         "<li>Native, dockable floating frames</li>"
         "<li>Perspective saving and loading</li>"