added a period at the end of a sentence (test commit, really)

[wxWidgets.git] / samples / widgets / widgets.cpp

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 71b3fb88727700156897c50042f1f767e1475118..19d86f02e3d752860886b995aeb3f85146404869 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -51,6 +51,9 @@
 #include "wx/imaglist.h"
 #include "wx/wupdlock.h"
 
 #include "wx/imaglist.h"
 #include "wx/wupdlock.h"
 

+#include "wx/persist/toplevel.h"
+#include "wx/persist/treebook.h"
+

 #include "widgets.h"
 
 #include "../sample.xpm"
 #include "widgets.h"
 
 #include "../sample.xpm"


@@ -325,6 +328,8 @@ bool WidgetsApp::OnInit()
     if ( !wxApp::OnInit() )
         return false;
 
     if ( !wxApp::OnInit() )
         return false;
 

+    SetVendorName("wxWidgets_Samples");
+

     // the reason for having these ifdef's is that I often run two copies of
     // this sample side by side and it is useful to see which one is which
     wxString title;
     // the reason for having these ifdef's is that I often run two copies of
     // this sample side by side and it is useful to see which one is which
     wxString title;


@@ -351,10 +356,6 @@ bool WidgetsApp::OnInit()
     wxFrame *frame = new WidgetsFrame(title + _T(" widgets demo"));
     frame->Show();
 
     wxFrame *frame = new WidgetsFrame(title + _T(" widgets demo"));
     frame->Show();
 

-    //wxLog::AddTraceMask(_T("listbox"));
-    //wxLog::AddTraceMask(_T("scrollbar"));
-    //wxLog::AddTraceMask(_T("focus"));
-

     return true;
 }
 
     return true;
 }
 


@@ -365,15 +366,18 @@ bool WidgetsApp::OnInit()
 WidgetsFrame::WidgetsFrame(const wxString& title)
             : wxFrame(NULL, wxID_ANY, title)
 {
 WidgetsFrame::WidgetsFrame(const wxString& title)
             : wxFrame(NULL, wxID_ANY, title)
 {

+    SetName("Main");
+    const bool sizeSet = wxPersistentRegisterAndRestore(this);
+

     // set the frame icon
     SetIcon(wxICON(sample));
 
     // init everything
 #if USE_LOG
     // set the frame icon
     SetIcon(wxICON(sample));
 
     // init everything
 #if USE_LOG

-    m_lboxLog = (wxListBox *)NULL;
-    m_logTarget = (wxLog *)NULL;
+    m_lboxLog = NULL;
+    m_logTarget = NULL;

 #endif // USE_LOG
 #endif // USE_LOG

-    m_book = (WidgetsBookCtrl *)NULL;
+    m_book = NULL;

 
 #if wxUSE_MENUS
     // create the menubar
 
 #if wxUSE_MENUS
     // create the menubar


@@ -435,13 +439,10 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
     // Uncomment to suppress page theme (draw in solid colour)
     //style |= wxNB_NOPAGETHEME;
 
     // Uncomment to suppress page theme (draw in solid colour)
     //style |= wxNB_NOPAGETHEME;
 

-    m_book = new WidgetsBookCtrl(m_panel, Widgets_BookCtrl, wxDefaultPosition,
-#ifdef __WXMOTIF__
-        wxSize(500, wxDefaultCoord), // under Motif, height is a function of the width...
-#else
-        wxDefaultSize,
-#endif
-        style);
+    m_book = new WidgetsBookCtrl(m_panel, Widgets_BookCtrl,
+                                 wxDefaultPosition, wxDefaultSize,
+                                 style, "Widgets");
+

     InitBook();
 
 #ifndef __WXHANDHELD__
     InitBook();
 
 #ifndef __WXHANDHELD__


@@ -482,7 +483,10 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
 
     m_panel->SetSizer(sizerTop);
 
 
     m_panel->SetSizer(sizerTop);
 

-    sizerTop->SetSizeHints(this);
+    const wxSize sizeMin = m_panel->GetBestSize();
+    if ( !sizeSet )
+        SetClientSize(sizeMin);
+    SetMinClientSize(sizeMin);

 
 #if USE_LOG && !defined(__WXCOCOA__)
     // wxCocoa's listbox is too flakey to use for logging right now
 
 #if USE_LOG && !defined(__WXCOCOA__)
     // wxCocoa's listbox is too flakey to use for logging right now


@@ -613,10 +617,13 @@ void WidgetsFrame::InitBook()
              wxEVT_COMMAND_WIDGETS_PAGE_CHANGED,
              wxWidgetsbookEventHandler(WidgetsFrame::OnPageChanged) );
 
              wxEVT_COMMAND_WIDGETS_PAGE_CHANGED,
              wxWidgetsbookEventHandler(WidgetsFrame::OnPageChanged) );
 

+    const bool pageSet = wxPersistentRegisterAndRestore(m_book);
+

 #if USE_TREEBOOK
     // for treebook page #0 is empty parent page only so select the first page
     // with some contents
 #if USE_TREEBOOK
     // for treebook page #0 is empty parent page only so select the first page
     // with some contents

-    m_book->SetSelection(1);
+    if ( !pageSet )
+        m_book->SetSelection(1);

 
     // but ensure that the top of the tree is shown nevertheless
     wxTreeCtrl * const tree = m_book->GetTreeCtrl();
 
     // but ensure that the top of the tree is shown nevertheless
     wxTreeCtrl * const tree = m_book->GetTreeCtrl();


@@ -624,10 +631,13 @@ void WidgetsFrame::InitBook()
     wxTreeItemIdValue cookie;
     tree->EnsureVisible(tree->GetFirstChild(tree->GetRootItem(), cookie));
 #else
     wxTreeItemIdValue cookie;
     tree->EnsureVisible(tree->GetFirstChild(tree->GetRootItem(), cookie));
 #else

-    // for other books set selection twice to force connected event handler
-    // to force lazy creation of initial visible content
-    m_book->SetSelection(1);
-    m_book->SetSelection(0);
+    if ( !pageSet )
+    {
+        // for other books set selection twice to force connected event handler
+        // to force lazy creation of initial visible content
+        m_book->SetSelection(1);
+        m_book->SetSelection(0);
+    }

 #endif // USE_TREEBOOK
 }
 
 #endif // USE_TREEBOOK
 }