get rid of wxClientDC::m_oldFont, it wasn't really used (this fixes crash introduced...

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

diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp
index 8534da6d87032682f1496a9624eded560f794cc0..bbdc0cae8afccae640be56e05b00786d1223f136 100644 (file)
--- a/samples/widgets/notebook.cpp
+++ b/samples/widgets/notebook.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample

 // Name:        notebook.cpp
 // Purpose:     Part of the widgets sample showing wxNotebook
 // Author:      Vadim Zeitlin
 // Name:        notebook.cpp
 // Purpose:     Part of the widgets sample showing wxNotebook
 // Author:      Vadim Zeitlin


@@ -24,6 +24,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_NOTEBOOK
+

 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/app.h"


@@ -44,7 +46,6 @@
 #include "wx/artprov.h"
 
 #include "widgets.h"
 #include "wx/artprov.h"
 
 #include "widgets.h"

-#if 1

 #include "icons/notebook.xpm"
 
 // ----------------------------------------------------------------------------
 #include "icons/notebook.xpm"
 
 // ----------------------------------------------------------------------------


@@ -78,11 +79,6 @@ enum Orient
     Orient_Max
 };
 
     Orient_Max
 };
 

-// old versions of wxWindows don't define this style
-#ifndef wxNB_TOP
-    #define wxNB_TOP (0)
-#endif
-

 // ----------------------------------------------------------------------------
 // NotebookWidgetsPage
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // NotebookWidgetsPage
 // ----------------------------------------------------------------------------


@@ -90,9 +86,11 @@ enum Orient
 class NotebookWidgetsPage : public WidgetsPage
 {
 public:
 class NotebookWidgetsPage : public WidgetsPage
 {
 public:

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

     virtual ~NotebookWidgetsPage();
 
     virtual ~NotebookWidgetsPage();
 

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

 protected:
     // event handlers
     void OnPageChanging(wxNotebookEvent& event);
 protected:
     // event handlers
     void OnPageChanging(wxNotebookEvent& event);


@@ -136,7 +134,7 @@ protected:
 
     // is the value in range?
     bool IsValidValue(int val) const
 
     // is the value in range?
     bool IsValidValue(int val) const

-        { return (val >= 0) && (val < m_notebook->GetPageCount()); }
+        { return (val >= 0) && (val < (int) m_notebook->GetPageCount()); }

 
     // the controls
     // ------------
 
     // the controls
     // ------------


@@ -181,11 +179,11 @@ BEGIN_EVENT_TABLE(NotebookWidgetsPage, WidgetsPage)
     EVT_UPDATE_UI(NotebookPage_InsertPage, NotebookWidgetsPage::OnUpdateUIInsertButton)
     EVT_UPDATE_UI(NotebookPage_RemovePage, NotebookWidgetsPage::OnUpdateUIRemoveButton)
 
     EVT_UPDATE_UI(NotebookPage_InsertPage, NotebookWidgetsPage::OnUpdateUIInsertButton)
     EVT_UPDATE_UI(NotebookPage_RemovePage, NotebookWidgetsPage::OnUpdateUIRemoveButton)
 

-    EVT_NOTEBOOK_PAGE_CHANGING(-1, NotebookWidgetsPage::OnPageChanging)
-    EVT_NOTEBOOK_PAGE_CHANGED(-1, NotebookWidgetsPage::OnPageChanged)
+    EVT_NOTEBOOK_PAGE_CHANGING(wxID_ANY, NotebookWidgetsPage::OnPageChanging)
+    EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, NotebookWidgetsPage::OnPageChanged)

 
 

-    EVT_CHECKBOX(-1, NotebookWidgetsPage::OnCheckOrRadioBox)
-    EVT_RADIOBOX(-1, NotebookWidgetsPage::OnCheckOrRadioBox)
+    EVT_CHECKBOX(wxID_ANY, NotebookWidgetsPage::OnCheckOrRadioBox)
+    EVT_RADIOBOX(wxID_ANY, NotebookWidgetsPage::OnCheckOrRadioBox)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


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

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

                                          wxImageList *imaglist)
                                          wxImageList *imaglist)

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

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


@@ -210,7 +208,7 @@ NotebookWidgetsPage::NotebookWidgetsPage(wxNotebook *notebook,
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane

-    wxStaticBox *box = new wxStaticBox(this, -1, _T("&Set style"));
+    wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style"));

 
     // must be in sync with Orient enum
     wxString orientations[] =
 
     // must be in sync with Orient enum
     wxString orientations[] =


@@ -224,8 +222,8 @@ NotebookWidgetsPage::NotebookWidgetsPage(wxNotebook *notebook,
     wxASSERT_MSG( WXSIZEOF(orientations) == Orient_Max,
                   _T("forgot to update something") );
 
     wxASSERT_MSG( WXSIZEOF(orientations) == Orient_Max,
                   _T("forgot to update something") );
 

-    m_chkImages = new wxCheckBox(this, -1, _T("Show &images"));
-    m_radioOrient = new wxRadioBox(this, -1, _T("&Tab orientation"),
+    m_chkImages = new wxCheckBox(this, wxID_ANY, _T("Show &images"));
+    m_radioOrient = new wxRadioBox(this, wxID_ANY, _T("&Tab orientation"),

                                    wxDefaultPosition, wxDefaultSize,
                                    WXSIZEOF(orientations), orientations,
                                    1, wxRA_SPECIFY_COLS);
                                    wxDefaultPosition, wxDefaultSize,
                                    WXSIZEOF(orientations), orientations,
                                    1, wxRA_SPECIFY_COLS);


@@ -240,20 +238,20 @@ NotebookWidgetsPage::NotebookWidgetsPage(wxNotebook *notebook,
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane

-    wxStaticBox *box2 = new wxStaticBox(this, -1, _T("&Contents"));
+    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, _T("&Contents"));

     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 
     wxTextCtrl *text;
     wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Number of pages: "),
                                                     NotebookPage_NumPagesText,
                                                     &text);
     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 
     wxTextCtrl *text;
     wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Number of pages: "),
                                                     NotebookPage_NumPagesText,
                                                     &text);

-    text->SetEditable(FALSE);
+    text->SetEditable(false);

     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
     sizerRow = CreateSizerWithTextAndLabel(_T("Current selection: "),
                                            NotebookPage_CurSelectText,
                                            &text);
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
     sizerRow = CreateSizerWithTextAndLabel(_T("Current selection: "),
                                            NotebookPage_CurSelectText,
                                            &text);

-    text->SetEditable(FALSE);
+    text->SetEditable(false);

     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
     sizerRow = CreateSizerWithTextAndButton(NotebookPage_SelectPage,
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
     sizerRow = CreateSizerWithTextAndButton(NotebookPage_SelectPage,


@@ -296,7 +294,6 @@ NotebookWidgetsPage::NotebookWidgetsPage(wxNotebook *notebook,
     Reset();
     CreateImageList();
 
     Reset();
     CreateImageList();
 

-    SetAutoLayout(TRUE);

     SetSizer(sizerTop);
 
     sizerTop->Fit(this);
     SetSizer(sizerTop);
 
     sizerTop->Fit(this);


@@ -313,7 +310,7 @@ NotebookWidgetsPage::~NotebookWidgetsPage()
 
 void NotebookWidgetsPage::Reset()
 {
 
 void NotebookWidgetsPage::Reset()
 {

-    m_chkImages->SetValue(TRUE);
+    m_chkImages->SetValue(true);

     m_radioOrient->SetSelection(Orient_Top);
 }
 
     m_radioOrient->SetSelection(Orient_Top);
 }
 


@@ -354,7 +351,7 @@ void NotebookWidgetsPage::CreateNotebook()
     switch ( m_radioOrient->GetSelection() )
     {
         default:
     switch ( m_radioOrient->GetSelection() )
     {
         default:

-            wxFAIL_MSG( _T("unknown notebok orientation") );
+            wxFAIL_MSG( _T("unknown notebook orientation") );

             // fall through
 
         case Orient_Top:
             // fall through
 
         case Orient_Top:


@@ -374,7 +371,7 @@ void NotebookWidgetsPage::CreateNotebook()
             break;
     }
 
             break;
     }
 

-    wxNotebook *notebook = m_notebook;
+    wxNotebook *old_note = m_notebook;

 
     m_notebook = new wxNotebook(this, NotebookPage_Notebook,
                                 wxDefaultPosition, wxDefaultSize,
 
     m_notebook = new wxNotebook(this, NotebookPage_Notebook,
                                 wxDefaultPosition, wxDefaultSize,


@@ -382,23 +379,24 @@ void NotebookWidgetsPage::CreateNotebook()
 
     CreateImageList();
 
 
     CreateImageList();
 

-    if ( notebook )
+    if ( old_note )

     {
     {

-        const int sel = notebook->GetSelection();
+        const int sel = old_note->GetSelection();

 
 

-        const int count = notebook->GetPageCount();
+        const int count = old_note->GetPageCount();

 
         // recreate the pages
         for ( int n = 0; n < count; n++ )
         {
             m_notebook->AddPage(CreateNewPage(),
 
         // recreate the pages
         for ( int n = 0; n < count; n++ )
         {
             m_notebook->AddPage(CreateNewPage(),

-                                notebook->GetPageText(n),
-                                FALSE,
-                                notebook->GetPageImage(n));
+                                old_note->GetPageText(n),
+                                false,
+                                m_chkImages->GetValue() ?
+                                GetIconIndex() : -1);

         }
 
         }
 

-        m_sizerNotebook->Detach( notebook );
-        delete notebook;
+        m_sizerNotebook->Detach( old_note );
+        delete old_note;

 
         // restore selection
         if ( sel != -1 )
 
         // restore selection
         if ( sel != -1 )


@@ -440,7 +438,7 @@ int NotebookWidgetsPage::GetIconIndex() const
 
 wxWindow *NotebookWidgetsPage::CreateNewPage()
 {
 
 wxWindow *NotebookWidgetsPage::CreateNewPage()
 {

-    return new wxTextCtrl(m_notebook, -1, _T("I'm a notebook page"));
+    return new wxTextCtrl(m_notebook, wxID_ANY, _T("I'm a notebook page"));

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -459,7 +457,7 @@ void NotebookWidgetsPage::OnButtonDeleteAll(wxCommandEvent& WXUNUSED(event))
     m_notebook->DeleteAllPages();
 }
 
     m_notebook->DeleteAllPages();
 }
 

-void NotebookWidgetsPage::OnButtonSelectPage(wxCommandEvent& event)
+void NotebookWidgetsPage::OnButtonSelectPage(wxCommandEvent& WXUNUSED(event))

 {
     int pos = GetTextValue(m_textSelect);
     wxCHECK_RET( IsValidValue(pos), _T("button should be disabled") );
 {
     int pos = GetTextValue(m_textSelect);
     wxCHECK_RET( IsValidValue(pos), _T("button should be disabled") );


@@ -469,7 +467,7 @@ void NotebookWidgetsPage::OnButtonSelectPage(wxCommandEvent& event)
 
 void NotebookWidgetsPage::OnButtonAddPage(wxCommandEvent& WXUNUSED(event))
 {
 
 void NotebookWidgetsPage::OnButtonAddPage(wxCommandEvent& WXUNUSED(event))
 {

-    m_notebook->AddPage(CreateNewPage(), _T("Added page"), FALSE,
+    m_notebook->AddPage(CreateNewPage(), _T("Added page"), false,

                         GetIconIndex());
 }
 
                         GetIconIndex());
 }
 


@@ -478,7 +476,7 @@ void NotebookWidgetsPage::OnButtonInsertPage(wxCommandEvent& WXUNUSED(event))
     int pos = GetTextValue(m_textInsert);
     wxCHECK_RET( IsValidValue(pos), _T("button should be disabled") );
 
     int pos = GetTextValue(m_textInsert);
     wxCHECK_RET( IsValidValue(pos), _T("button should be disabled") );
 

-    m_notebook->InsertPage(pos, CreateNewPage(), _T("Inserted page"), FALSE,
+    m_notebook->InsertPage(pos, CreateNewPage(), _T("Inserted page"), false,

                            GetIconIndex());
 }
 
                            GetIconIndex());
 }
 


@@ -521,7 +519,7 @@ void NotebookWidgetsPage::OnUpdateUICurSelectText(wxUpdateUIEvent& event)
     event.SetText( wxString::Format(_T("%d"), m_notebook->GetSelection()) );
 }
 
     event.SetText( wxString::Format(_T("%d"), m_notebook->GetSelection()) );
 }
 

-void NotebookWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
+void NotebookWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))

 {
     CreateNotebook();
 }
 {
     CreateNotebook();
 }


@@ -546,4 +544,4 @@ void NotebookWidgetsPage::OnPageChanged(wxNotebookEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-#endif
+#endif // wxUSE_NOTEBOOK