More small devices adjustements.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp
index add4b52b3de5ec8258083e824262261cefa31490..21cdf14029e6595360574c4a45bd217da43311aa 100644 (file)
--- a/samples/widgets/notebook.cpp
+++ b/samples/widgets/notebook.cpp
@@ -119,8 +119,10 @@ protected:
     void RecreateBook();
     virtual wxBookCtrlBase *CreateBook(long flags) = 0;
 
+#if USE_ICONS_IN_BOOK
     // create or destroy the image list
     void CreateImageList();
+#endif // USE_ICONS_IN_BOOK
 
     // create a new page
     wxWindow *CreateNewPage();
@@ -151,8 +153,10 @@ protected:
     wxBookCtrlBase *m_book;
     wxSizer *m_sizerBook;
 
-    // thei mage list for our book
+#if USE_ICONS_IN_BOOK
+    // the image list for our book
     wxImageList *m_imageList;
+#endif // USE_ICONS_IN_BOOK
 
 private:
     DECLARE_EVENT_TABLE()
@@ -190,7 +194,9 @@ BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, c
 {
     // init everything
     m_chkImages = NULL;
+#if USE_ICONS_IN_BOOK
     m_imageList = NULL;
+#endif // USE_ICONS_IN_BOOK
 
     m_book = NULL;
     m_sizerBook = (wxSizer *)NULL;
@@ -275,7 +281,9 @@ BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, c
 
     // final initializations
     Reset();
+#if USE_ICONS_IN_BOOK
     CreateImageList();
+#endif // USE_ICONS_IN_BOOK
 
     SetSizer(sizerTop);
 
@@ -284,7 +292,9 @@ BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, c
 
 BookWidgetsPage::~BookWidgetsPage()
 {
+#if USE_ICONS_IN_BOOK
     delete m_imageList;
+#endif // USE_ICONS_IN_BOOK
 }
 
 // ----------------------------------------------------------------------------
@@ -297,6 +307,7 @@ void BookWidgetsPage::Reset()
     m_radioOrient->SetSelection(Orient_Top);
 }
 
+#if USE_ICONS_IN_BOOK
 void BookWidgetsPage::CreateImageList()
 {
     if ( m_chkImages->GetValue() )
@@ -328,6 +339,7 @@ void BookWidgetsPage::CreateImageList()
     // it would be logical if this removed the image list from book, under
     // MSW it crashes instead - FIXME
 }
+#endif // USE_ICONS_IN_BOOK
 
 void BookWidgetsPage::RecreateBook()
 {
@@ -359,7 +371,9 @@ void BookWidgetsPage::RecreateBook()
 
     m_book = CreateBook(flags);
 
+#if USE_ICONS_IN_BOOK
     CreateImageList();
+#endif // USE_ICONS_IN_BOOK
 
     if ( oldBook )
     {
@@ -407,6 +421,7 @@ int BookWidgetsPage::GetTextValue(wxTextCtrl *text) const
 
 int BookWidgetsPage::GetIconIndex() const
 {
+#if USE_ICONS_IN_BOOK
     if ( m_imageList )
     {
        int nImages = m_imageList->GetImageCount();
@@ -415,6 +430,7 @@ int BookWidgetsPage::GetIconIndex() const
            return m_book->GetPageCount() % nImages;
        }
     }
+#endif // USE_ICONS_IN_BOOK
 
     return -1;
 }

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 533b35e8190e470c94f417d3ba6bac436d99d5c1..8287db11ae9477f4fd231528b1fd263457111b78 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -325,7 +325,7 @@ bool WidgetsApp::OnInit()
 
 WidgetsFrame::WidgetsFrame(const wxString& title)
             : wxFrame(NULL, wxID_ANY, title,
-                      wxPoint(0, 50), wxDefaultSize,
+                      wxDefaultPosition, wxDefaultSize,
                       wxDEFAULT_FRAME_STYLE |
                       wxNO_FULL_REPAINT_ON_RESIZE |
                       wxCLIP_CHILDREN |