X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd018e7e31361bc2112a386f18663908a0559d58..a905bdb8a46ce2516009d260bd75b47161c3d49a:/samples/widgets/widgets.cpp

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index c93a10a1d6..2b03a39c03 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Program:     wxWidgets Widgets Sample
-// Name:        widgets.cpp
+// Name:        samples/widgets/widgets.cpp
 // Purpose:     Sample showing most of the simple wxWidgets widgets
 // Author:      Vadim Zeitlin
 // Created:     27.03.01
@@ -125,7 +125,7 @@ private:
 #endif // USE_LOG
 
     // the book containing the test pages
-    wxBookCtrl *m_book;
+    wxBookCtrlBase *m_book;
 
     // and the image list for it
     wxImageList *m_imaglist;
@@ -290,7 +290,7 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
     m_lboxLog = (wxListBox *)NULL;
     m_logTarget = (wxLog *)NULL;
 #endif // USE_LOG
-    m_book = (wxBookCtrl *)NULL;
+    m_book = (wxBookCtrlBase *)NULL;
     m_imaglist = (wxImageList *)NULL;
 
 #if wxUSE_MENUS
@@ -322,12 +322,17 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
     // we have 2 panes: book with pages demonstrating the controls in the
     // upper one and the log window with some buttons in the lower
 
-    int style = wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN|wxBC_DEFAULT;
+    int style = wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN|wxBK_DEFAULT;
     // Uncomment to suppress page theme (draw in solid colour)
     //style |= wxNB_NOPAGETHEME;
 
     m_book = new wxBookCtrl(m_panel, wxID_ANY, wxDefaultPosition,
-        wxDefaultSize, style);
+#ifdef __WXMOTIF__
+        wxSize(500, wxDefaultCoord), // under Motif, height is a function of the width...
+#else
+        wxDefaultSize,
+#endif
+        style);
     InitBook();
 
 #ifndef __SMARTPHONE__
@@ -639,7 +644,7 @@ WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label)
 // WidgetsPage
 // ----------------------------------------------------------------------------
 
-WidgetsPage::WidgetsPage(wxBookCtrl *book)
+WidgetsPage::WidgetsPage(wxBookCtrlBase *book)
            : wxPanel(book, wxID_ANY,
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_FULL_REPAINT_ON_RESIZE |
@@ -693,4 +698,3 @@ wxCheckBox *WidgetsPage::CreateCheckBoxAndAddToSizer(wxSizer *sizer,
 
     return checkbox;
 }
-