check default library directories in WX_PATH_FIND_LIBRARIES; do *not* add default...

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

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index c93a10a1d637778e1f17270c0db5a03fb6656fa0..d656113dd7415095849539bb8372cf217c971e87 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -125,7 +125,7 @@ private:
 #endif // USE_LOG
 
     // the book containing the test pages
 #endif // USE_LOG
 
     // the book containing the test pages

-    wxBookCtrl *m_book;
+    wxBookCtrlBase *m_book;

 
     // and the image list for it
     wxImageList *m_imaglist;
 
     // 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_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
     m_imaglist = (wxImageList *)NULL;
 
 #if wxUSE_MENUS


@@ -327,7 +327,12 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
     //style |= wxNB_NOPAGETHEME;
 
     m_book = new wxBookCtrl(m_panel, wxID_ANY, wxDefaultPosition,
     //style |= wxNB_NOPAGETHEME;
 
     m_book = new wxBookCtrl(m_panel, wxID_ANY, wxDefaultPosition,

-        wxDefaultSize, style);
+#ifdef __WXMOTIF__
+        wxSize(500, -1), // under Motif, height is a function of the width...
+#else
+        wxDefaultSize,
+#endif
+        style);

     InitBook();
 
 #ifndef __SMARTPHONE__
     InitBook();
 
 #ifndef __SMARTPHONE__


@@ -639,7 +644,7 @@ WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label)
 // WidgetsPage
 // ----------------------------------------------------------------------------
 
 // WidgetsPage
 // ----------------------------------------------------------------------------
 

-WidgetsPage::WidgetsPage(wxBookCtrl *book)
+WidgetsPage::WidgetsPage(wxBookCtrlBase *book)

            : wxPanel(book, wxID_ANY,
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_FULL_REPAINT_ON_RESIZE |
            : wxPanel(book, wxID_ANY,
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_FULL_REPAINT_ON_RESIZE |