X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23c2b62bb4ff8559472e63839a62b30e8d073359..fa7134b05abb0d8df4b800762aa9d040bfd689a4:/samples/widgets/widgets.cpp?ds=sidebyside

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 440cbcf32e..1637eb113b 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -30,6 +30,7 @@
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/menu.h"
+    #include "wx/image.h"
 
     #include "wx/button.h"
     #include "wx/checkbox.h"
@@ -205,7 +206,7 @@ public:
 
 private:
     // implement sink functions
-    virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+    virtual void DoLog(wxLogLevel level, const wxString& str, time_t t)
     {
         // don't put trace messages into listbox or we can get into infinite
         // recursion
@@ -214,20 +215,20 @@ private:
             if ( m_logOld )
             {
                 // cast is needed to call protected method
-                ((LboxLogger *)m_logOld)->DoLog(level, szString, t);
+                ((LboxLogger *)m_logOld)->DoLog(level, str, t);
             }
         }
         else
         {
-            wxLog::DoLog(level, szString, t);
+            wxLog::DoLog(level, str, t);
         }
     }
 
-    virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+    virtual void DoLogString(const wxString& str, time_t WXUNUSED(t))
     {
         wxString msg;
         TimeStamp(&msg);
-        msg += szString;
+        msg += str;
 
         #ifdef __WXUNIVERSAL__
             m_lbox->AppendAndEnsureVisible(msg);
@@ -270,7 +271,6 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame)
 
 #if wxUSE_MENUS
     EVT_WIDGETS_PAGE_CHANGING(wxID_ANY, WidgetsFrame::OnPageChanging)
-    EVT_WIDGETS_PAGE_CHANGED(wxID_ANY, WidgetsFrame::OnPageChanged)
     EVT_MENU_RANGE(Widgets_GoToPage, Widgets_GoToPageLast,
                    WidgetsFrame::OnGoToPage)
 
@@ -317,6 +317,10 @@ bool WidgetsApp::OnInit()
     title += _T("wxMAC");
 #elif defined(__WXMOTIF__)
     title += _T("wxMOTIF");
+#elif __WXPALMOS5__
+    title += _T("wxPALMOS5");
+#elif __WXPALMOS6__
+    title += _T("wxPALMOS6");
 #else
     title += _T("wxWidgets");
 #endif
@@ -444,7 +448,6 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
 
     m_panel->SetSizer(sizerTop);
 
-    sizerTop->Fit(this);
     sizerTop->SetSizeHints(this);
 
 #if USE_LOG && !defined(__WXCOCOA__)
@@ -459,9 +462,10 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
 void WidgetsFrame::InitBook()
 {
 #if USE_ICONS_IN_BOOK
-    wxImageList *imageList = new wxImageList(32, 32);
+    wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
 
-    imageList->Add(wxBitmap(sample_xpm));
+    wxImage img(sample_xpm);
+    imageList->Add(wxBitmap(img.Scale(ICON_SIZE, ICON_SIZE)));
 #else
     wxImageList *imageList = NULL;
 #endif
@@ -571,6 +575,10 @@ void WidgetsFrame::InitBook()
         }
     }
 
+    Connect( wxID_ANY,
+             wxEVT_COMMAND_WIDGETS_PAGE_CHANGED,
+             wxWidgetsbookEventHandler(WidgetsFrame::OnPageChanged) );
+
 #if USE_TREEBOOK
     // for treebook page #0 is empty parent page only so select the first page
     // with some contents
@@ -581,6 +589,11 @@ void WidgetsFrame::InitBook()
 
     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);
 #endif // USE_TREEBOOK
 }
 
@@ -625,8 +638,13 @@ void WidgetsFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event))
 
 void WidgetsFrame::OnPageChanging(WidgetsBookCtrlEvent& event)
 {
+#if USE_TREEBOOK
+    // don't allow selection of entries without pages (categories)
     if ( !m_book->GetPage(event.GetSelection()) )
         event.Veto();
+#else
+    wxUnusedVar(event);
+#endif
 }
 
 void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event)
@@ -640,12 +658,16 @@ void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event)
 
     GetMenuBar()->Check(Widgets_BusyCursor, false);
 
-    // lazy creation of the pages
+    // create the pages on demand, otherwise the sample startup is too slow as
+    // it creates hundreds of controls
     WidgetsPage *page = CurrentPage();
     if ( page->GetChildren().empty() )
     {
         wxWindowUpdateLocker noUpdates(page);
         page->CreateContent();
+        //page->Layout();
+        page->GetSizer()->Fit(page);
+
         WidgetsBookCtrl *book = wxStaticCast(page->GetParent(), WidgetsBookCtrl);
         wxSize size;
         for ( size_t i = 0; i < book->GetPageCount(); ++i )
@@ -904,7 +926,7 @@ WidgetsPageInfo *WidgetsPage::ms_widgetPages = NULL;
 
 WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
                          wxImageList *imaglist,
-                         char* icon[])
+                         const char *const icon[])
            : wxPanel(book, wxID_ANY,
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_FULL_REPAINT_ON_RESIZE |
@@ -912,7 +934,7 @@ WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
                      wxTAB_TRAVERSAL)
 {
 #if USE_ICONS_IN_BOOK
-    imaglist->Add(wxBitmap(icon));
+    imaglist->Add(wxBitmap(wxImage(icon).Scale(ICON_SIZE, ICON_SIZE)));
 #else
     wxUnusedVar(imaglist);
     wxUnusedVar(icon);