disabled wxStackWalker and wxCrashReport for Win64

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

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index e15d1c5f46691debf159a254acaa369248305a21..ad083b352e99d7d60dbddbfdefc5dfc04916603a 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -24,6 +24,10 @@
 #include "wx/artprov.h"
 #include "notebook.h"
 
 #include "wx/artprov.h"
 #include "notebook.h"
 

+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
+#endif
+

 IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()


@@ -44,7 +48,7 @@ bool MyApp::OnInit()
     return true;
 }
 
     return true;
 }
 

-wxPanel *CreateUserCreatedPage(wxBookCtrl *parent)
+wxPanel *CreateUserCreatedPage(wxBookCtrlBase *parent)

 {
     wxPanel *panel = new wxPanel(parent);
 
 {
     wxPanel *panel = new wxPanel(parent);
 


@@ -54,7 +58,7 @@ wxPanel *CreateUserCreatedPage(wxBookCtrl *parent)
     return panel;
 }
 
     return panel;
 }
 

-wxPanel *CreateRadioButtonsPage(wxBookCtrl *parent)
+wxPanel *CreateRadioButtonsPage(wxBookCtrlBase *parent)

 {
     wxPanel *panel = new wxPanel(parent);
 
 {
     wxPanel *panel = new wxPanel(parent);
 


@@ -79,7 +83,7 @@ wxPanel *CreateRadioButtonsPage(wxBookCtrl *parent)
     return panel;
 }
 
     return panel;
 }
 

-wxPanel *CreateVetoPage(wxBookCtrl *parent)
+wxPanel *CreateVetoPage(wxBookCtrlBase *parent)

 {
     wxPanel *panel = new wxPanel(parent);
 
 {
     wxPanel *panel = new wxPanel(parent);
 


@@ -89,7 +93,7 @@ wxPanel *CreateVetoPage(wxBookCtrl *parent)
     return panel;
 }
 
     return panel;
 }
 

-wxPanel *CreateBigButtonPage(wxBookCtrl *parent)
+wxPanel *CreateBigButtonPage(wxBookCtrlBase *parent)

 {
     wxPanel *panel = new wxPanel(parent);
 
 {
     wxPanel *panel = new wxPanel(parent);
 


@@ -103,7 +107,7 @@ wxPanel *CreateBigButtonPage(wxBookCtrl *parent)
 }
 
 
 }
 
 

-wxPanel *CreateInsertPage(wxBookCtrl *parent)
+wxPanel *CreateInsertPage(wxBookCtrlBase *parent)

 {
     wxPanel *panel = new wxPanel(parent);
 
 {
     wxPanel *panel = new wxPanel(parent);
 


@@ -114,7 +118,7 @@ wxPanel *CreateInsertPage(wxBookCtrl *parent)
     return panel;
 }
 
     return panel;
 }
 

-int GetIconIndex(wxBookCtrl* bookCtrl)
+int GetIconIndex(wxBookCtrlBase* bookCtrl)

 {
     if (bookCtrl && bookCtrl->GetImageList())
     {
 {
     if (bookCtrl && bookCtrl->GetImageList())
     {


@@ -128,7 +132,7 @@ int GetIconIndex(wxBookCtrl* bookCtrl)
     return -1;
 }
 
     return -1;
 }
 

-void CreateInitialPages(wxBookCtrl *parent)
+void CreateInitialPages(wxBookCtrlBase *parent)

 {
     // Create and add some panels to the notebook
 
 {
     // Create and add some panels to the notebook
 


@@ -147,7 +151,7 @@ void CreateInitialPages(wxBookCtrl *parent)
     parent->SetSelection(1);
 }
 
     parent->SetSelection(1);
 }
 

-wxPanel *CreatePage(wxBookCtrl *parent, const wxString&pageName)
+wxPanel *CreatePage(wxBookCtrlBase *parent, const wxString&pageName)

 {
     if
     (
 {
     if
     (


@@ -188,13 +192,23 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
                  long style)
     : wxFrame((wxWindow *) NULL, wxID_ANY, title, pos, size, style)
 {
                  long style)
     : wxFrame((wxWindow *) NULL, wxID_ANY, title, pos, size, style)
 {

+#if wxUSE_NOTEBOOK

     m_type = ID_BOOK_NOTEBOOK;
     m_type = ID_BOOK_NOTEBOOK;

+#elif wxUSE_CHOICEBOOK
+    m_type = ID_BOOK_CHOICEBOOK;
+#elif wxUSE_LISTBOOK
+    m_type = ID_BOOK_LISTBOOK;
+#elif
+    #error "Don't use Notebook sample without any book enabled in wxWidgets build!"
+#endif
+

     m_orient = ID_ORIENT_DEFAULT;
     m_chkShowImages = true;
     m_multi = false;
 
     m_orient = ID_ORIENT_DEFAULT;
     m_chkShowImages = true;
     m_multi = false;
 

-    // menu of the sample
+    SetIcon(wxICON(sample));

 
 

+    // menu of the sample

     wxMenu *menuType = new wxMenu;
 #if wxUSE_NOTEBOOK
     menuType->AppendRadioItem(ID_BOOK_NOTEBOOK,   wxT("&Notebook\tCtrl-1"));
     wxMenu *menuType = new wxMenu;
 #if wxUSE_NOTEBOOK
     menuType->AppendRadioItem(ID_BOOK_NOTEBOOK,   wxT("&Notebook\tCtrl-1"));


@@ -205,6 +219,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 #if wxUSE_CHOICEBOOK
     menuType->AppendRadioItem(ID_BOOK_CHOICEBOOK, wxT("&Choicebook\tCtrl-3"));
 #endif
 #if wxUSE_CHOICEBOOK
     menuType->AppendRadioItem(ID_BOOK_CHOICEBOOK, wxT("&Choicebook\tCtrl-3"));
 #endif

+    menuType->Check(m_type, true);

 
     wxMenu *menuOrient = new wxMenu;
     menuOrient->AppendRadioItem(ID_ORIENT_DEFAULT, wxT("&Default\tCtrl-4"));
 
     wxMenu *menuOrient = new wxMenu;
     menuOrient->AppendRadioItem(ID_ORIENT_DEFAULT, wxT("&Default\tCtrl-4"));


@@ -325,6 +340,12 @@ int MyFrame::SelectFlag(int id, int nb, int lb, int chb)
     return 0;
 }
 
     return 0;
 }
 

+#ifdef __SMARTPHONE__
+    #define MARGIN 0
+#else
+    #define MARGIN 4
+#endif
+

 #define RECREATE( wxBookType , idBook, oldBook , newBook )                         \
 {                                                                                  \
     int flags;                                                                     \
 #define RECREATE( wxBookType , idBook, oldBook , newBook )                         \
 {                                                                                  \
     int flags;                                                                     \


@@ -393,7 +414,7 @@ int MyFrame::SelectFlag(int id, int nb, int lb, int chb)
         CreateInitialPages(newBook);                                               \
     }                                                                              \
                                                                                    \
         CreateInitialPages(newBook);                                               \
     }                                                                              \
                                                                                    \

-    m_sizerFrame->Insert(0, newBook, 5, wxEXPAND | wxALL, 4);                      \
+    m_sizerFrame->Insert(0, newBook, 5, wxEXPAND | wxALL, MARGIN);                 \

                                                                                    \
     m_sizerFrame->Hide(newBook);                                                   \
 }
                                                                                    \
     m_sizerFrame->Hide(newBook);                                                   \
 }


@@ -413,7 +434,7 @@ void MyFrame::RecreateBooks()
     ShowCurrentBook();
 }
 
     ShowCurrentBook();
 }
 

-wxBookCtrl *MyFrame::GetCurrentBook()
+wxBookCtrlBase *MyFrame::GetCurrentBook()

 {
     switch (m_type)
     {
 {
     switch (m_type)
     {


@@ -483,7 +504,7 @@ END_EVENT_TABLE()
 
 void MyFrame::OnType(wxCommandEvent& event)
 {
 
 void MyFrame::OnType(wxCommandEvent& event)
 {

-    wxBookCtrl *currBook = GetCurrentBook();
+    wxBookCtrlBase *currBook = GetCurrentBook();

 
     m_type = event.GetId();
 
 
     m_type = event.GetId();
 


@@ -524,7 +545,7 @@ void MyFrame::OnAddPage(wxCommandEvent& WXUNUSED(event))
 {
     static unsigned s_pageAdded = 0;
 
 {
     static unsigned s_pageAdded = 0;
 

-    wxBookCtrl *currBook = GetCurrentBook();
+    wxBookCtrlBase *currBook = GetCurrentBook();

 
     if ( currBook )
     {
 
     if ( currBook )
     {


@@ -543,7 +564,7 @@ void MyFrame::OnInsertPage(wxCommandEvent& WXUNUSED(event))
 {
     static unsigned s_pageIns = 0;
 
 {
     static unsigned s_pageIns = 0;
 

-    wxBookCtrl *currBook = GetCurrentBook();
+    wxBookCtrlBase *currBook = GetCurrentBook();

 
     if ( currBook )
     {
 
     if ( currBook )
     {


@@ -559,7 +580,7 @@ void MyFrame::OnInsertPage(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnDeleteCurPage(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnDeleteCurPage(wxCommandEvent& WXUNUSED(event))
 {

-    wxBookCtrl *currBook = GetCurrentBook();
+    wxBookCtrlBase *currBook = GetCurrentBook();

 
     if ( currBook )
     {
 
     if ( currBook )
     {


@@ -574,7 +595,7 @@ void MyFrame::OnDeleteCurPage(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnDeleteLastPage(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnDeleteLastPage(wxCommandEvent& WXUNUSED(event))
 {

-    wxBookCtrl *currBook = GetCurrentBook();
+    wxBookCtrlBase *currBook = GetCurrentBook();

 
     if ( currBook )
     {
 
     if ( currBook )
     {


@@ -589,7 +610,7 @@ void MyFrame::OnDeleteLastPage(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnNextPage(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnNextPage(wxCommandEvent& WXUNUSED(event))
 {

-    wxBookCtrl *currBook = GetCurrentBook();
+    wxBookCtrlBase *currBook = GetCurrentBook();

 
     if ( currBook )
     {
 
     if ( currBook )
     {


@@ -601,9 +622,9 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 {
     static int s_nPages = wxNOT_FOUND;
     static int s_nSel = wxNOT_FOUND;
 {
     static int s_nPages = wxNOT_FOUND;
     static int s_nSel = wxNOT_FOUND;

-    static wxBookCtrl *s_currBook = NULL;
+    static wxBookCtrlBase *s_currBook = NULL;

 
 

-    wxBookCtrl *currBook = GetCurrentBook();
+    wxBookCtrlBase *currBook = GetCurrentBook();

 
     int nPages = currBook ? currBook->GetPageCount() : 0;
     int nSel = currBook ? currBook->GetSelection() : wxNOT_FOUND;
 
     int nPages = currBook ? currBook->GetPageCount() : 0;
     int nSel = currBook ? currBook->GetSelection() : wxNOT_FOUND;


@@ -627,6 +648,12 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
     }
 }
 
     }
 }
 

+#if USE_LOG
+    #define BOOKEVENT_LOG m_text->SetInsertionPointEnd();
+#else
+    #define BOOKEVENT_LOG
+#endif
+

 #define BOOKEVENT(OnBook,wxBookEvent,bookStr,wxEVT_PAGE_CHANGED,wxEVT_PAGE_CHANGING,s_num) \
 void MyFrame::OnBook(wxBookEvent& event)                                                   \
 {                                                                                          \
 #define BOOKEVENT(OnBook,wxBookEvent,bookStr,wxEVT_PAGE_CHANGED,wxEVT_PAGE_CHANGING,s_num) \
 void MyFrame::OnBook(wxBookEvent& event)                                                   \
 {                                                                                          \


@@ -643,7 +670,7 @@ void MyFrame::OnBook(wxBookEvent& event)
     else if (eventType == wxEVT_PAGE_CHANGING)                                             \
     {                                                                                      \
         int idx = event.GetOldSelection();                                                 \
     else if (eventType == wxEVT_PAGE_CHANGING)                                             \
     {                                                                                      \
         int idx = event.GetOldSelection();                                                 \

-        wxBookCtrl *book = (wxBookCtrl *)event.GetEventObject();                           \
+        wxBookCtrlBase *book = (wxBookCtrlBase *)event.GetEventObject();                   \

         if ( idx != wxNOT_FOUND && book && book->GetPageText(idx) == VETO_PAGE_NAME )      \
         {                                                                                  \
             if                                                                             \
         if ( idx != wxNOT_FOUND && book && book->GetPageText(idx) == VETO_PAGE_NAME )      \
         {                                                                                  \
             if                                                                             \


@@ -671,7 +698,7 @@ void MyFrame::OnBook(wxBookEvent& event)
                                                                                            \
     wxLogMessage(logMsg.c_str());                                                          \
                                                                                            \
                                                                                            \
     wxLogMessage(logMsg.c_str());                                                          \
                                                                                            \

-    m_text->SetInsertionPointEnd();                                                        \
+    BOOKEVENT_LOG                                                                          \

 }
 
 #if wxUSE_NOTEBOOK
 }
 
 #if wxUSE_NOTEBOOK