Reverted last wxBookCtrl change and added alignment check to notebook

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/bookctrl.cpp

@@ -268,11 +268,8 @@ wxRect wxBookCtrlBase::GetPageRect() const
 
     wxPoint pt;
     wxRect rectPage(pt, GetClientSize());
-    long style = GetWindowStyle();
-    if ( !HasFlag(wxBK_ALIGN_MASK) )
-        style = GetDefaultAlignment();
 
-    switch ( style )
+    switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
     {
         default:
             wxFAIL_MSG( _T("unexpected alignment") );