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

compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-08-21 12:54:31 +00:00
parent 789d0a3dd9
commit 8d34bf5cc9
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@ public:
// accessors // accessors
// --------- // ---------
// get number of pages in the dialog // get number of pages in the dialog
int GetPageCount() const; virtual size_t GetPageCount() const;
// set the currently selected page, return the index of the previously // set the currently selected page, return the index of the previously
// selected one (or -1 on error) // selected one (or -1 on error)

22
src/msw/notebook.cpp
View File

@ -73,7 +73,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// check that the page index is valid // check that the page index is valid
#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount())) #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
// hide the ugly cast // hide the ugly cast
#define m_hwnd (HWND)GetHWND() #define m_hwnd (HWND)GetHWND()
@ -283,7 +283,7 @@ WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const
// wxNotebook accessors // wxNotebook accessors
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
int wxNotebook::GetPageCount() const size_t wxNotebook::GetPageCount() const
{ {
// consistency check // consistency check
wxASSERT( (int)m_pages.Count() == TabCtrl_GetItemCount(m_hwnd) ); wxASSERT( (int)m_pages.Count() == TabCtrl_GetItemCount(m_hwnd) );
@ -296,7 +296,7 @@ int wxNotebook::GetRowCount() const
return TabCtrl_GetRowCount(m_hwnd); return TabCtrl_GetRowCount(m_hwnd);
} }
int wxNotebook::SetSelection(int nPage) int wxNotebook::SetSelection(size_t nPage)
{ {
wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") ); wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") );
@ -319,7 +319,7 @@ int wxNotebook::SetSelection(int nPage)
return m_nSelection; return m_nSelection;
} }
bool wxNotebook::SetPageText(int nPage, const wxString& strText) bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
{ {
wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") ); wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") );
@ -330,7 +330,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText)
return TabCtrl_SetItem(m_hwnd, nPage, &tcItem) != 0; return TabCtrl_SetItem(m_hwnd, nPage, &tcItem) != 0;
} }
wxString wxNotebook::GetPageText(int nPage) const wxString wxNotebook::GetPageText(size_t nPage) const
{ {
wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, wxT("notebook page out of range") ); wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, wxT("notebook page out of range") );
@ -347,7 +347,7 @@ wxString wxNotebook::GetPageText(int nPage) const
return str; return str;
} }
int wxNotebook::GetPageImage(int nPage) const int wxNotebook::GetPageImage(size_t nPage) const
{ {
wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") ); wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") );
@ -357,7 +357,7 @@ int wxNotebook::GetPageImage(int nPage) const
return TabCtrl_GetItem(m_hwnd, nPage, &tcItem) ? tcItem.iImage : -1; return TabCtrl_GetItem(m_hwnd, nPage, &tcItem) ? tcItem.iImage : -1;
} }
bool wxNotebook::SetPageImage(int nPage, int nImage) bool wxNotebook::SetPageImage(size_t nPage, int nImage)
{ {
wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") ); wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") );
@ -456,7 +456,7 @@ void wxNotebook::AdjustPageSize(wxNotebookPage *page)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// remove one page from the notebook, without deleting // remove one page from the notebook, without deleting
wxNotebookPage *wxNotebook::DoRemovePage(int nPage) wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
{ {
wxNotebookPage *pageRemoved = wxNotebookBase::DoRemovePage(nPage); wxNotebookPage *pageRemoved = wxNotebookBase::DoRemovePage(nPage);
if ( !pageRemoved ) if ( !pageRemoved )
@ -510,8 +510,8 @@ wxNotebookPage *wxNotebook::DoRemovePage(int nPage)
// remove all pages // remove all pages
bool wxNotebook::DeleteAllPages() bool wxNotebook::DeleteAllPages()
{ {
int nPageCount = GetPageCount(); size_t nPageCount = GetPageCount();
int nPage; size_t nPage;
for ( nPage = 0; nPage < nPageCount; nPage++ ) for ( nPage = 0; nPage < nPageCount; nPage++ )
delete m_pages[nPage]; delete m_pages[nPage];
@ -525,7 +525,7 @@ bool wxNotebook::DeleteAllPages()
} }
// same as AddPage() but does it at given position // same as AddPage() but does it at given position
bool wxNotebook::InsertPage(int nPage, bool wxNotebook::InsertPage(size_t nPage,
wxNotebookPage *pPage, wxNotebookPage *pPage,
const wxString& strText, const wxString& strText,
bool bSelect, bool bSelect,