X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00e086a7f09c2a2e00a3ee0ca57e338ed608c88f..2fa7bb014e38306b5d3d0565313afbdcc6722bd3:/src/univ/notebook.cpp diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp index c97f7189b8..457ef098d0 100644 --- a/src/univ/notebook.cpp +++ b/src/univ/notebook.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "univnotebook.h" -#endif - #ifdef __VMS #pragma message disable unscomzer #endif @@ -144,7 +140,7 @@ bool wxNotebook::Create(wxWindow *parent, wxString wxNotebook::GetPageText(size_t nPage) const { - wxCHECK_MSG( IS_VALID_PAGE(nPage), _T(""), _T("invalid notebook page") ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, _T("invalid notebook page") ); return m_titles[nPage]; } @@ -473,7 +469,7 @@ void wxNotebook::DoDrawTab(wxDC& dc, const wxRect& rect, size_t n) m_imageList->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, true); dc.SelectObject(wxNullBitmap); #else - bmp = *m_imageList->GetBitmap(image); + bmp = m_imageList->GetBitmap(image); #endif } @@ -1253,7 +1249,7 @@ void wxNotebook::ScrollLastTo(int page) wxSize wxNotebook::DoGetBestClientSize() const { // calculate the max page size - wxSize size(0, 0); + wxSize size; size_t count = GetPageCount(); if ( count )