X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a290fa5a7deebe9d96c0c0089d18e27d4bd9b624..6fb603d7458a2df50d11e9afa85d61e3bdb36eb6:/src/univ/notebook.cpp diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp index c515179ccd..29f728072d 100644 --- a/src/univ/notebook.cpp +++ b/src/univ/notebook.cpp @@ -48,7 +48,7 @@ // due to unsigned type nPage is always >= 0 #define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((size_t(nPage)) < GetPageCount())) #else -#define IS_VALID_PAGE(nPage) ((size_t(nPage)) < GetPageCount()) +#define IS_VALID_PAGE(nPage) (((size_t)nPage) < GetPageCount()) #endif // ---------------------------------------------------------------------------- @@ -1127,7 +1127,7 @@ void wxNotebook::UpdateSpinBtn() } else // all tabs are visible, we don't need spin button { - if ( m_spinbtn ) + if ( m_spinbtn && m_spinbtn -> IsShown() ) { m_spinbtn->Hide(); } @@ -1285,9 +1285,9 @@ void wxNotebook::DoSetSize(int x, int y, wxSize old_client_size = GetClientSize(); wxControl::DoSetSize(x, y, width, height, sizeFlags); - + wxSize new_client_size = GetClientSize(); - + if (old_client_size != new_client_size) Relayout(); }