Smartphone fixes.

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

diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp
index 736e43f8fb8bb45f62b61475dc9452938e8ca1f3..2d8c217cf7d2791eaaaea4e04c47247c8049925d 100644 (file)
--- a/samples/widgets/notebook.cpp
+++ b/samples/widgets/notebook.cpp
@@ -86,7 +86,7 @@ enum Orient
 class NotebookWidgetsPage : public WidgetsPage
 {
 public:
 class NotebookWidgetsPage : public WidgetsPage
 {
 public:

-    NotebookWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
+    NotebookWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);

     virtual ~NotebookWidgetsPage();
 
     virtual wxControl *GetWidget() const { return m_notebook; }
     virtual ~NotebookWidgetsPage();
 
     virtual wxControl *GetWidget() const { return m_notebook; }


@@ -192,9 +192,9 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(NotebookWidgetsPage, _T("Notebook"));
 
 
 IMPLEMENT_WIDGETS_PAGE(NotebookWidgetsPage, _T("Notebook"));
 

-NotebookWidgetsPage::NotebookWidgetsPage(wxNotebook *notebook,
+NotebookWidgetsPage::NotebookWidgetsPage(wxBookCtrl *book,

                                          wxImageList *imaglist)
                                          wxImageList *imaglist)

-                  : WidgetsPage(notebook)
+                  : WidgetsPage(book)

 {
     imaglist->Add(wxBitmap(notebook_xpm));
 
 {
     imaglist->Add(wxBitmap(notebook_xpm));
 

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 62f9724543694332f9e6ac8f10efd38479ade846..a254e5cbf4f452edd553a599b3d433604ac35755 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -401,6 +401,7 @@ void WidgetsFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event))
 
 void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event))
 {
 
 void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_COLOURDLG

     wxColour col = wxGetColourFromUser(this, m_colFg);
     if ( !col.Ok() )
         return;
     wxColour col = wxGetColourFromUser(this, m_colFg);
     if ( !col.Ok() )
         return;


@@ -410,10 +411,14 @@ void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event))
     WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
     page->GetWidget()->SetForegroundColour(m_colFg);
     page->GetWidget()->Refresh();
     WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
     page->GetWidget()->SetForegroundColour(m_colFg);
     page->GetWidget()->Refresh();

+#else
+    wxLogMessage(_T("None colour dialog available in current build."));
+#endif

 }
 
 void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_COLOURDLG

     wxColour col = wxGetColourFromUser(this, m_colBg);
     if ( !col.Ok() )
         return;
     wxColour col = wxGetColourFromUser(this, m_colBg);
     if ( !col.Ok() )
         return;


@@ -423,6 +428,9 @@ void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
     WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
     page->GetWidget()->SetBackgroundColour(m_colBg);
     page->GetWidget()->Refresh();
     WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
     page->GetWidget()->SetBackgroundColour(m_colBg);
     page->GetWidget()->Refresh();

+#else
+    wxLogMessage(_T("None colour dialog available in current build."));
+#endif

 }
 
 #endif // wxUSE_MENUS
 }
 
 #endif // wxUSE_MENUS