AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No real changes, just replace -1 with wxNOT_FOUND in wxBookCtrl code.

Browse Source 
Make the code consistently use wxNOT_FOUND instead of -1 everywhere.

See #12622.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-10-27 16:54:24 +00:00
parent ef0fdf3914
commit 7e837615b9
16 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/bookctrl.h
View File

@ -204,7 +204,7 @@ public:
int imageId = -1) = 0;
// set the currently selected page, return the index of the previously
// selected one (or -1 on error)
// selected one (or wxNOT_FOUND on error)
//
// NB: this function will generate PAGE_CHANGING/ED events
virtual int SetSelection(size_t n) = 0;
@ -217,7 +217,7 @@ public:
void AdvanceSelection(bool forward = true)
{
int nPage = GetNextPage(forward);
if ( nPage != -1 )
if ( nPage != wxNOT_FOUND )
{
// cast is safe because of the check above
SetSelection((size_t)nPage);
@ -353,7 +353,7 @@ class WXDLLIMPEXP_CORE wxBookCtrlEvent : public wxNotifyEvent
{
public:
wxBookCtrlEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,
int nSel = -1, int nOldSel = -1)
int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND)
: wxNotifyEvent(commandType, winid)
{
m_nSel = nSel;
@ -370,10 +370,10 @@ public:
virtual wxEvent *Clone() const { return new wxBookCtrlEvent(*this); }
// accessors
// the currently selected page (-1 if none)
// the currently selected page (wxNOT_FOUND if none)
int GetSelection() const { return m_nSel; }
void SetSelection(int nSel) { m_nSel = nSel; }
// the page that was selected before the change (-1 if none)
// the page that was selected before the change (wxNOT_FOUND if none)
int GetOldSelection() const { return m_nOldSel; }
void SetOldSelection(int nOldSel) { m_nOldSel = nOldSel; }

2
include/wx/cocoa/notebook.h
View File

@ -56,7 +56,7 @@ protected:
// ------------------------------------------------------------------------
public:
// set the currently selected page, return the index of the previously
// selected one (or -1 on error)
// selected one (or wxNOT_FOUND on error)
int SetSelection(size_t nPage);
// get the currently selected page
int GetSelection() const;

4
include/wx/generic/notebook.h
View File

@ -56,11 +56,11 @@ public:
// accessors
// ---------
// Find the position of the wxNotebookPage, -1 if not found.
// Find the position of the wxNotebookPage, wxNOT_FOUND if not found.
int FindPagePosition(wxNotebookPage* page) const;
// set the currently selected page, return the index of the previously
// selected one (or -1 on error)
// selected one (or wxNOT_FOUND on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
int SetSelection(size_t nPage);
// cycle thru the tabs

2
include/wx/gtk/notebook.h
View File

@ -50,7 +50,7 @@ public:
// ---------
// set the currently selected page, return the index of the previously
// selected one (or -1 on error)
// selected one (or wxNOT_FOUND on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
// get the currently selected page

2
include/wx/gtk1/notebook.h
View File

@ -50,7 +50,7 @@ public:
// ---------
// set the currently selected page, return the index of the previously
// selected one (or -1 on error)
// selected one (or wxNOT_FOUND on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
// get the currently selected page

2
include/wx/msw/notebook.h
View File

@ -86,7 +86,7 @@ public:
virtual size_t GetPageCount() const;
// set the currently selected page, return the index of the previously
// selected one (or -1 on error)
// selected one (or wxNOT_FOUND on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
int SetSelection(size_t nPage);
// get the currently selected page

4
include/wx/notebook.h
View File

@ -96,8 +96,8 @@ public:
bool SendPageChangingEvent(int nPage);
// sends the event about page change from old to new (or GetSelection() if
// new is -1)
void SendPageChangedEvent(int nPageOld, int nPageNew = -1);
// new is wxNOT_FOUND)
void SendPageChangedEvent(int nPageOld, int nPageNew = wxNOT_FOUND);
// wxBookCtrlBase overrides this method to return false but we do need
// focus because we have tabs

2
include/wx/os2/notebook.h
View File

@ -61,7 +61,7 @@ public:
//
// Set the currently selected page, return the index of the previously
// selected one (or -1 on error)
// selected one (or wxNOT_FOUND on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
//
int SetSelection(size_t nPage);

2
include/wx/osx/notebook.h
View File

@ -55,7 +55,7 @@ public:
// accessors
// ---------
// set the currently selected page, return the index of the previously
// selected one (or -1 on error)
// selected one (or wxNOT_FOUND on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
// get the currently selected page

2
src/cocoa/notebook.mm
View File

@ -301,7 +301,7 @@ int wxNotebook::GetSelection() const
{
NSTabViewItem *selectedItem = [GetNSTabView() selectedTabViewItem];
if(!selectedItem)
return -1;
return wxNOT_FOUND;
return [GetNSTabView() indexOfTabViewItem:selectedItem];
}

8
src/generic/listbkg.cpp
View File

@ -355,16 +355,16 @@ wxListbook::InsertPage(size_t n,
// some page should be selected: either this one or the first one if there
// is still no selection
int selNew = -1;
int selNew = wxNOT_FOUND;
if ( bSelect )
selNew = n;
else if ( m_selection == -1 )
else if ( m_selection == wxNOT_FOUND )
selNew = 0;
if ( selNew != m_selection )
page->Hide();
if ( selNew != -1 )
if ( selNew != wxNOT_FOUND )
SetSelection(selNew);
UpdateSize();
@ -387,7 +387,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page)
int sel = m_selection - 1;
if (page_count == 1)
sel = wxNOT_FOUND;
else if ((page_count == 2) || (sel == -1))
else if ((page_count == 2) || (sel == wxNOT_FOUND))
sel = 0;
// force sel invalid if deleting current page - don't try to hide it

6
src/generic/toolbkg.cpp
View File

@ -235,13 +235,13 @@ void wxToolbook::Realize()
GetToolBar()->Realize();
}
if (m_selection == -1)
if (m_selection == wxNOT_FOUND)
m_selection = 0;
if (GetPageCount() > 0)
{
int sel = m_selection;
m_selection = -1;
m_selection = wxNOT_FOUND;
SetSelection(sel);
}
@ -352,7 +352,7 @@ wxWindow *wxToolbook::DoRemovePage(size_t page)
int sel = m_selection - 1;
if (page_count == 1)
sel = wxNOT_FOUND;
else if ((page_count == 2) || (sel == -1))
else if ((page_count == 2) || (sel == wxNOT_FOUND))
sel = 0;
// force sel invalid if deleting current page - don't try to hide it

6
src/gtk/notebook.cpp
View File

@ -202,7 +202,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
int wxNotebook::GetSelection() const
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") );
return gtk_notebook_get_current_page( GTK_NOTEBOOK(m_widget) );
}
@ -217,7 +217,7 @@ wxString wxNotebook::GetPageText( size_t page ) const
int wxNotebook::GetPageImage( size_t page ) const
{
wxCHECK_MSG(page < GetPageCount(), -1, "invalid notebook index");
wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index");
return GetNotebookPage(page)->m_imageIndex;
}
@ -229,7 +229,7 @@ wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
int wxNotebook::DoSetSelection( size_t page, int flags )
{
wxCHECK_MSG(page < GetPageCount(), -1, "invalid notebook index");
wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index");
int selOld = GetSelection();

12
src/gtk1/notebook.cpp
View File

@ -227,7 +227,7 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk
if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
{
int sel = notebook->GetSelection();
if (sel == -1)
if (sel == wxNOT_FOUND)
return TRUE;
wxGtkNotebookPage *nb_page = notebook->GetNotebookPage(sel);
wxCHECK_MSG( nb_page, FALSE, wxT("invalid selection in wxNotebook") );
@ -362,9 +362,9 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
int wxNotebook::GetSelection() const
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") );
if ( m_selection == -1 )
if ( m_selection == wxNOT_FOUND )
{
GList *nb_pages = GTK_NOTEBOOK(m_widget)->children;
@ -417,7 +417,7 @@ wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
int wxNotebook::DoSetSelection( size_t page, int flags )
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") );
wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") );
@ -597,10 +597,10 @@ bool wxNotebook::DeleteAllPages()
wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
{
if ( m_selection != -1 && (size_t)m_selection >= page )
if ( m_selection != wxNOT_FOUND && (size_t)m_selection >= page )
{
// the index will become invalid after the page is deleted
m_selection = -1;
m_selection = wxNOT_FOUND;
}
wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);

8
src/os2/notebook.cpp
View File

@ -429,7 +429,7 @@ wxNotebookPage* wxNotebook::DoRemovePage ( size_t nPage )
}
else // nothing changes for the currently selected page
{
nSelNew = -1;
nSelNew = wxNOT_FOUND;
//
// We still must refresh the current page: this needs to be done
@ -440,7 +440,7 @@ wxNotebookPage* wxNotebook::DoRemovePage ( size_t nPage )
m_pages[m_nSelection]->Refresh();
}
if (nSelNew != -1)
if (nSelNew != wxNOT_FOUND)
{
//
// m_nSelection must be always valid so reset it before calling
@ -653,14 +653,14 @@ bool wxNotebook::InsertPage ( size_t nPage,
// Some page should be selected: either this one or the first one if there is
// still no selection
//
int nSelNew = -1;
int nSelNew = wxNOT_FOUND;
if (bSelect)
nSelNew = nPage;
else if ( m_nSelection == -1 )
nSelNew = 0;
if (nSelNew != -1)
if (nSelNew != wxNOT_FOUND)
SetSelection(nSelNew);
InvalidateBestSize();

8
src/osx/notebook_osx.cpp
View File

@ -268,13 +268,13 @@ bool wxNotebook::InsertPage(size_t nPage,
// some page should be selected: either this one or the first one if there
// is still no selection
int selNew = -1;
int selNew = wxNOT_FOUND;
if ( bSelect )
selNew = nPage;
else if ( m_nSelection == -1 )
selNew = 0;
if ( selNew != -1 )
if ( selNew != wxNOT_FOUND )
SetSelection( selNew );
InvalidateBestSize();
@ -508,10 +508,10 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
if (nOldSel == nSel)
return;
if ( nOldSel != -1 )
if ( nOldSel != wxNOT_FOUND )
m_pages[nOldSel]->Show( false );
if ( nSel != -1 )
if ( nSel != wxNOT_FOUND )
{
wxNotebookPage *pPage = m_pages[nSel];
if ( IsShownOnScreen() )