X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/315a592c4e245fde618941d9f3580bf9989c2c4e..d8eff331e23435d9d8d6483a40f6fd9997a13f87:/samples/widgets/notebook.cpp?ds=sidebyside diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp index 0bfc12be5c..ded5de3900 100644 --- a/samples/widgets/notebook.cpp +++ b/samples/widgets/notebook.cpp @@ -86,7 +86,7 @@ enum Orient class BookWidgetsPage : public WidgetsPage { public: - BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, char* icon[]); + BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, const char *const icon[]); virtual ~BookWidgetsPage(); virtual wxControl *GetWidget() const { return m_book; } @@ -192,7 +192,7 @@ END_EVENT_TABLE() // implementation // ============================================================================ -BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, char* icon[]) +BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, const char *const icon[]) :WidgetsPage(book, imaglist, icon) { // init everything @@ -211,20 +211,20 @@ void BookWidgetsPage::CreateContent() wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL); // left pane - wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style")); + wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style")); // must be in sync with Orient enum wxArrayString orientations; - orientations.Add(_T("&top")); - orientations.Add(_T("&bottom")); - orientations.Add(_T("&left")); - orientations.Add(_T("&right")); + orientations.Add(wxT("&top")); + orientations.Add(wxT("&bottom")); + orientations.Add(wxT("&left")); + orientations.Add(wxT("&right")); wxASSERT_MSG( orientations.GetCount() == Orient_Max, - _T("forgot to update something") ); + wxT("forgot to update something") ); - m_chkImages = new wxCheckBox(this, wxID_ANY, _T("Show &images")); - m_radioOrient = new wxRadioBox(this, wxID_ANY, _T("&Tab orientation"), + m_chkImages = new wxCheckBox(this, wxID_ANY, wxT("Show &images")); + m_radioOrient = new wxRadioBox(this, wxID_ANY, wxT("&Tab orientation"), wxDefaultPosition, wxDefaultSize, orientations, 1, wxRA_SPECIFY_COLS); @@ -234,48 +234,48 @@ void BookWidgetsPage::CreateContent() sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer sizerLeft->Add(m_radioOrient, 0, wxALL, 5); - wxButton *btn = new wxButton(this, BookPage_Reset, _T("&Reset")); + wxButton *btn = new wxButton(this, BookPage_Reset, wxT("&Reset")); sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15); // middle pane - wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, _T("&Contents")); + wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Contents")); wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL); wxTextCtrl *text; - wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Number of pages: "), + wxSizer *sizerRow = CreateSizerWithTextAndLabel(wxT("Number of pages: "), BookPage_NumPagesText, &text); text->SetEditable(false); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); - sizerRow = CreateSizerWithTextAndLabel(_T("Current selection: "), + sizerRow = CreateSizerWithTextAndLabel(wxT("Current selection: "), BookPage_CurSelectText, &text); text->SetEditable(false); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); sizerRow = CreateSizerWithTextAndButton(BookPage_SelectPage, - _T("&Select page"), + wxT("&Select page"), BookPage_SelectText, &m_textSelect); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); - btn = new wxButton(this, BookPage_AddPage, _T("&Add page")); + btn = new wxButton(this, BookPage_AddPage, wxT("&Add page")); sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5); sizerRow = CreateSizerWithTextAndButton(BookPage_InsertPage, - _T("&Insert page at"), + wxT("&Insert page at"), BookPage_InsertText, &m_textInsert); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); sizerRow = CreateSizerWithTextAndButton(BookPage_RemovePage, - _T("&Remove page"), + wxT("&Remove page"), BookPage_RemoveText, &m_textRemove); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); - btn = new wxButton(this, BookPage_DeleteAll, _T("&Delete All")); + btn = new wxButton(this, BookPage_DeleteAll, wxT("&Delete All")); sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5); // right pane @@ -295,8 +295,6 @@ void BookWidgetsPage::CreateContent() #endif // USE_ICONS_IN_BOOK SetSizer(sizerTop); - - sizerTop->Fit(this); } BookWidgetsPage::~BookWidgetsPage() @@ -361,7 +359,7 @@ void BookWidgetsPage::RecreateBook() switch ( m_radioOrient->GetSelection() ) { default: - wxFAIL_MSG( _T("unknown orientation") ); + wxFAIL_MSG( wxT("unknown orientation") ); // fall through case Orient_Top: @@ -452,7 +450,7 @@ int BookWidgetsPage::GetIconIndex() const wxWindow *BookWidgetsPage::CreateNewPage() { - return new wxTextCtrl(m_book, wxID_ANY, _T("I'm a book page")); + return new wxTextCtrl(m_book, wxID_ANY, wxT("I'm a book page")); } // ---------------------------------------------------------------------------- @@ -474,30 +472,30 @@ void BookWidgetsPage::OnButtonDeleteAll(wxCommandEvent& WXUNUSED(event)) void BookWidgetsPage::OnButtonSelectPage(wxCommandEvent& WXUNUSED(event)) { int pos = GetTextValue(m_textSelect); - wxCHECK_RET( IsValidValue(pos), _T("button should be disabled") ); + wxCHECK_RET( IsValidValue(pos), wxT("button should be disabled") ); m_book->SetSelection(pos); } void BookWidgetsPage::OnButtonAddPage(wxCommandEvent& WXUNUSED(event)) { - m_book->AddPage(CreateNewPage(), _T("Added page"), false, + m_book->AddPage(CreateNewPage(), wxT("Added page"), false, GetIconIndex()); } void BookWidgetsPage::OnButtonInsertPage(wxCommandEvent& WXUNUSED(event)) { int pos = GetTextValue(m_textInsert); - wxCHECK_RET( IsValidValue(pos), _T("button should be disabled") ); + wxCHECK_RET( IsValidValue(pos), wxT("button should be disabled") ); - m_book->InsertPage(pos, CreateNewPage(), _T("Inserted page"), false, + m_book->InsertPage(pos, CreateNewPage(), wxT("Inserted page"), false, GetIconIndex()); } void BookWidgetsPage::OnButtonRemovePage(wxCommandEvent& WXUNUSED(event)) { int pos = GetTextValue(m_textRemove); - wxCHECK_RET( IsValidValue(pos), _T("button should be disabled") ); + wxCHECK_RET( IsValidValue(pos), wxT("button should be disabled") ); m_book->DeletePage(pos); } @@ -527,13 +525,13 @@ void BookWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event) void BookWidgetsPage::OnUpdateUINumPagesText(wxUpdateUIEvent& event) { if(m_book) - event.SetText( wxString::Format(_T("%d"), m_book->GetPageCount()) ); + event.SetText( wxString::Format(wxT("%u"), unsigned(m_book->GetPageCount())) ); } void BookWidgetsPage::OnUpdateUICurSelectText(wxUpdateUIEvent& event) { if(m_book) - event.SetText( wxString::Format(_T("%d"), m_book->GetSelection()) ); + event.SetText( wxString::Format(wxT("%d"), m_book->GetSelection()) ); } void BookWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event)) @@ -596,13 +594,13 @@ END_EVENT_TABLE() #define FAMILY_CTRLS NATIVE_CTRLS #endif -IMPLEMENT_WIDGETS_PAGE(NotebookWidgetsPage, _T("Notebook"), +IMPLEMENT_WIDGETS_PAGE(NotebookWidgetsPage, wxT("Notebook"), FAMILY_CTRLS | BOOK_CTRLS ); void NotebookWidgetsPage::OnPageChanging(wxNotebookEvent& event) { - wxLogMessage(_T("Notebook page changing from %d to %d (currently %d)."), + wxLogMessage(wxT("Notebook page changing from %d to %d (currently %d)."), event.GetOldSelection(), event.GetSelection(), m_book->GetSelection()); @@ -612,7 +610,7 @@ void NotebookWidgetsPage::OnPageChanging(wxNotebookEvent& event) void NotebookWidgetsPage::OnPageChanged(wxNotebookEvent& event) { - wxLogMessage(_T("Notebook page changed from %d to %d (currently %d)."), + wxLogMessage(wxT("Notebook page changed from %d to %d (currently %d)."), event.GetOldSelection(), event.GetSelection(), m_book->GetSelection()); @@ -669,13 +667,13 @@ BEGIN_EVENT_TABLE(ListbookWidgetsPage, BookWidgetsPage) EVT_LISTBOOK_PAGE_CHANGED(wxID_ANY, ListbookWidgetsPage::OnPageChanged) END_EVENT_TABLE() -IMPLEMENT_WIDGETS_PAGE(ListbookWidgetsPage, _T("Listbook"), +IMPLEMENT_WIDGETS_PAGE(ListbookWidgetsPage, wxT("Listbook"), GENERIC_CTRLS | BOOK_CTRLS ); void ListbookWidgetsPage::OnPageChanging(wxListbookEvent& event) { - wxLogMessage(_T("Listbook page changing from %d to %d (currently %d)."), + wxLogMessage(wxT("Listbook page changing from %d to %d (currently %d)."), event.GetOldSelection(), event.GetSelection(), m_book->GetSelection()); @@ -685,7 +683,7 @@ void ListbookWidgetsPage::OnPageChanging(wxListbookEvent& event) void ListbookWidgetsPage::OnPageChanged(wxListbookEvent& event) { - wxLogMessage(_T("Listbook page changed from %d to %d (currently %d)."), + wxLogMessage(wxT("Listbook page changed from %d to %d (currently %d)."), event.GetOldSelection(), event.GetSelection(), m_book->GetSelection()); @@ -742,13 +740,13 @@ BEGIN_EVENT_TABLE(ChoicebookWidgetsPage, BookWidgetsPage) EVT_CHOICEBOOK_PAGE_CHANGED(wxID_ANY, ChoicebookWidgetsPage::OnPageChanged) END_EVENT_TABLE() -IMPLEMENT_WIDGETS_PAGE(ChoicebookWidgetsPage, _T("Choicebook"), +IMPLEMENT_WIDGETS_PAGE(ChoicebookWidgetsPage, wxT("Choicebook"), GENERIC_CTRLS | BOOK_CTRLS ); void ChoicebookWidgetsPage::OnPageChanging(wxChoicebookEvent& event) { - wxLogMessage(_T("Choicebook page changing from %d to %d (currently %d)."), + wxLogMessage(wxT("Choicebook page changing from %d to %d (currently %d)."), event.GetOldSelection(), event.GetSelection(), m_book->GetSelection()); @@ -758,7 +756,7 @@ void ChoicebookWidgetsPage::OnPageChanging(wxChoicebookEvent& event) void ChoicebookWidgetsPage::OnPageChanged(wxChoicebookEvent& event) { - wxLogMessage(_T("Choicebook page changed from %d to %d (currently %d)."), + wxLogMessage(wxT("Choicebook page changed from %d to %d (currently %d)."), event.GetOldSelection(), event.GetSelection(), m_book->GetSelection());