don't use char hook to handle Esc in the dialogs, it is too blunt and prevents us...

[wxWidgets.git] / src / msw / notebook.cpp

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 372e442059ee8984ecda895bbff479c8215e3116..3ca3d0f8b5fb526a3739790ad898184b281d9ffc 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -111,84 +111,82 @@ BEGIN_EVENT_TABLE(wxNotebook, wxControl)
 
     EVT_SIZE(wxNotebook::OnSize)
 
 
     EVT_SIZE(wxNotebook::OnSize)
 

-    EVT_SET_FOCUS(wxNotebook::OnSetFocus)
-

     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxNotebookStyle )
 
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxNotebookStyle )
 

-WX_BEGIN_FLAGS( wxNotebookStyle )
+wxBEGIN_FLAGS( wxNotebookStyle )

     // new style border flags, we put them first to
     // use them for streaming out
     // new style border flags, we put them first to
     // use them for streaming out

-    WX_FLAGS_MEMBER(wxBORDER_SIMPLE)
-    WX_FLAGS_MEMBER(wxBORDER_SUNKEN)
-    WX_FLAGS_MEMBER(wxBORDER_DOUBLE)
-    WX_FLAGS_MEMBER(wxBORDER_RAISED)
-    WX_FLAGS_MEMBER(wxBORDER_STATIC)
-    WX_FLAGS_MEMBER(wxBORDER_NONE)
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)

     
     // old style border flags
     
     // old style border flags

-    WX_FLAGS_MEMBER(wxSIMPLE_BORDER)
-    WX_FLAGS_MEMBER(wxSUNKEN_BORDER)
-    WX_FLAGS_MEMBER(wxDOUBLE_BORDER)
-    WX_FLAGS_MEMBER(wxRAISED_BORDER)
-    WX_FLAGS_MEMBER(wxSTATIC_BORDER)
-    WX_FLAGS_MEMBER(wxNO_BORDER)
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)

 
     // standard window styles
 
     // standard window styles

-    WX_FLAGS_MEMBER(wxTAB_TRAVERSAL)
-    WX_FLAGS_MEMBER(wxCLIP_CHILDREN)
-    WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    WX_FLAGS_MEMBER(wxWANTS_CHARS)
-    WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
-    WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    WX_FLAGS_MEMBER(wxVSCROLL)
-    WX_FLAGS_MEMBER(wxHSCROLL)
-
-    WX_FLAGS_MEMBER(wxNB_FIXEDWIDTH)
-    WX_FLAGS_MEMBER(wxNB_LEFT)
-    WX_FLAGS_MEMBER(wxNB_RIGHT)
-    WX_FLAGS_MEMBER(wxNB_BOTTOM)
-
-WX_END_FLAGS( wxNotebookStyle )
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxNB_FIXEDWIDTH)
+    wxFLAGS_MEMBER(wxNB_LEFT)
+    wxFLAGS_MEMBER(wxNB_RIGHT)
+    wxFLAGS_MEMBER(wxNB_BOTTOM)
+
+wxEND_FLAGS( wxNotebookStyle )

 
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxControl,"wx/notebook.h")
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebookPageInfo, wxObject , "wx/notebook.h" )
 
 
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxControl,"wx/notebook.h")
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebookPageInfo, wxObject , "wx/notebook.h" )
 

-WX_COLLECTION_TYPE_INFO( wxNotebookPageInfo * , wxNotebookPageInfoList ) ;
+wxCOLLECTION_TYPE_INFO( wxNotebookPageInfo * , wxNotebookPageInfoList ) ;

 
 template<> void wxCollectionToVariantArray( wxNotebookPageInfoList const &theList, wxxVariantArray &value)
 {
     wxListCollectionToVariantArray<wxNotebookPageInfoList::compatibility_iterator>( theList , value ) ;
 }
 
 
 template<> void wxCollectionToVariantArray( wxNotebookPageInfoList const &theList, wxxVariantArray &value)
 {
     wxListCollectionToVariantArray<wxNotebookPageInfoList::compatibility_iterator>( theList , value ) ;
 }
 

-WX_BEGIN_PROPERTIES_TABLE(wxNotebook)
-    WX_EVENT_PROPERTY( PageChanging , wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING , wxNotebookEvent )
-    WX_EVENT_PROPERTY( PageChanged , wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED , wxNotebookEvent )
+wxBEGIN_PROPERTIES_TABLE(wxNotebook)
+    wxEVENT_PROPERTY( PageChanging , wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING , wxNotebookEvent )
+    wxEVENT_PROPERTY( PageChanged , wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED , wxNotebookEvent )

 
 

-    WX_PROPERTY_COLLECTION( PageInfos , wxNotebookPageInfoList , wxNotebookPageInfo* , AddPageInfo , GetPageInfos , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    WX_PROPERTY_FLAGS( WindowStyle , wxNotebookStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-WX_END_PROPERTIES_TABLE()
+    wxPROPERTY_COLLECTION( PageInfos , wxNotebookPageInfoList , wxNotebookPageInfo* , AddPageInfo , GetPageInfos , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxNotebookStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()

 
 

-WX_BEGIN_HANDLERS_TABLE(wxNotebook)
-WX_END_HANDLERS_TABLE()
+wxBEGIN_HANDLERS_TABLE(wxNotebook)
+wxEND_HANDLERS_TABLE()

 
 

-WX_CONSTRUCTOR_5( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle) 
+wxCONSTRUCTOR_5( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle) 

 
 
 
 

-WX_BEGIN_PROPERTIES_TABLE(wxNotebookPageInfo)
-    WX_READONLY_PROPERTY( Page , wxNotebookPage* , GetPage , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    WX_READONLY_PROPERTY( Text , wxString , GetText , wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    WX_READONLY_PROPERTY( Selected , bool , GetSelected , false, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    WX_READONLY_PROPERTY( ImageId , int , GetImageId , -1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-WX_END_PROPERTIES_TABLE()
+wxBEGIN_PROPERTIES_TABLE(wxNotebookPageInfo)
+    wxREADONLY_PROPERTY( Page , wxNotebookPage* , GetPage , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxREADONLY_PROPERTY( Text , wxString , GetText , wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxREADONLY_PROPERTY( Selected , bool , GetSelected , false, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxREADONLY_PROPERTY( ImageId , int , GetImageId , -1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()

 
 

-WX_BEGIN_HANDLERS_TABLE(wxNotebookPageInfo)
-WX_END_HANDLERS_TABLE()
+wxBEGIN_HANDLERS_TABLE(wxNotebookPageInfo)
+wxEND_HANDLERS_TABLE()

 
 

-WX_CONSTRUCTOR_4( wxNotebookPageInfo , wxNotebookPage* , Page , wxString , Text , bool , Selected , int , ImageId ) 
+wxCONSTRUCTOR_4( wxNotebookPageInfo , wxNotebookPage* , Page , wxString , Text , bool , Selected , int , ImageId ) 

 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)


@@ -267,14 +265,14 @@ bool wxNotebook::Create(wxWindow *parent,
     
     if ( !CreateControl(parent, id, pos, size, style | wxTAB_TRAVERSAL,
                         wxDefaultValidator, name) )
     
     if ( !CreateControl(parent, id, pos, size, style | wxTAB_TRAVERSAL,
                         wxDefaultValidator, name) )

-        return FALSE;
+        return false;

 
     if ( !MSWCreateControl(WC_TABCONTROL, wxEmptyString, pos, size) )
 
     if ( !MSWCreateControl(WC_TABCONTROL, wxEmptyString, pos, size) )

-        return FALSE;
+        return false;

 
     SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE)));
 
 
     SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE)));
 

-    return TRUE;
+    return true;

 }
 
 WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const
 }
 
 WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const


@@ -348,7 +346,7 @@ int wxNotebook::SetSelection(size_t nPage)
 
 bool wxNotebook::SetPageText(size_t 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") );

 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_TEXT;
 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_TEXT;


@@ -386,7 +384,7 @@ int wxNotebook::GetPageImage(size_t nPage) const
 
 bool wxNotebook::SetPageImage(size_t 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") );

 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_IMAGE;
 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_IMAGE;


@@ -418,7 +416,7 @@ void wxNotebook::SetPageSize(const wxSize& size)
     rc.right = size.x;
     rc.bottom = size.y;
 
     rc.right = size.x;
     rc.bottom = size.y;
 

-    TabCtrl_AdjustRect(GetHwnd(), TRUE, &rc);
+    TabCtrl_AdjustRect(GetHwnd(), true, &rc);

 
     // and now set it
     SetSize(rc.right - rc.left, rc.bottom - rc.top);
 
     // and now set it
     SetSize(rc.right - rc.left, rc.bottom - rc.top);


@@ -473,7 +471,7 @@ void wxNotebook::AdjustPageSize(wxNotebookPage *page)
 
     // get the page size from the notebook size
     GetSize((int *)&rc.right, (int *)&rc.bottom);
 
     // get the page size from the notebook size
     GetSize((int *)&rc.right, (int *)&rc.bottom);

-    TabCtrl_AdjustRect(m_hwnd, FALSE, &rc);
+    TabCtrl_AdjustRect(m_hwnd, false, &rc);

 
     page->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top);
 }
 
     page->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top);
 }


@@ -498,37 +496,35 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
     }
     else // notebook still not empty
     {
     }
     else // notebook still not empty
     {

-        // change the selected page if it was deleted or became invalid
-        int selNew;
-        if ( m_nSelection == int(GetPageCount()) )
-        {
-            // last page deleted, make the new last page the new selection
-            selNew = m_nSelection - 1;
-        }
-        else if ( int(nPage) <= m_nSelection )
+        int selNew = TabCtrl_GetCurSel(m_hwnd);
+        if (selNew != -1)

         {
         {

-            // we must show another page, even if it has the same index
-            selNew = m_nSelection;
+            // No selection change, just refresh the current selection.
+            // Because it could be that the slection index changed 
+            // we need to update it. 
+            // Note: this does not mean the selection it self changed.
+            m_nSelection = selNew;
+            m_pages[m_nSelection]->Refresh();

         }
         }

-        else // nothing changes for the currently selected page
-        {
-            selNew = -1;
-
-            // we still must refresh the current page: this needs to be done
-            // for some unknown reason if the tab control shows the up-down
-            // control (i.e. when there are too many pages) -- otherwise after
-            // deleting a page nothing at all is shown
-            if (m_nSelection >= 0)
-                m_pages[m_nSelection]->Refresh();
-        }
-
-        if ( selNew != -1 )
+        else if (int(nPage) == m_nSelection)

         {
         {

+            // The selection was deleted.
+            
+            // Determine new selection.
+            if (m_nSelection == int(GetPageCount()))
+                selNew = m_nSelection - 1;
+            else
+                selNew = m_nSelection;
+            

             // m_nSelection must be always valid so reset it before calling
             // SetSelection()
             m_nSelection = -1;
             SetSelection(selNew);
         }
             // m_nSelection must be always valid so reset it before calling
             // SetSelection()
             m_nSelection = -1;
             SetSelection(selNew);
         }

+        else
+        {
+            wxFAIL; // Windows did not behave ok.
+        }

     }
 
     return pageRemoved;
     }
 
     return pageRemoved;


@@ -548,7 +544,7 @@ bool wxNotebook::DeleteAllPages()
 
   m_nSelection = -1;
 
 
   m_nSelection = -1;
 

-  return TRUE;
+  return true;

 }
 
 // same as AddPage() but does it at given position
 }
 
 // same as AddPage() but does it at given position


@@ -558,22 +554,22 @@ bool wxNotebook::InsertPage(size_t nPage,
                             bool bSelect,
                             int imageId)
 {
                             bool bSelect,
                             int imageId)
 {

-    wxCHECK_MSG( pPage != NULL, FALSE, _T("NULL page in wxNotebook::InsertPage") );
-    wxCHECK_MSG( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE,
+    wxCHECK_MSG( pPage != NULL, false, _T("NULL page in wxNotebook::InsertPage") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), false,

                  _T("invalid index in wxNotebook::InsertPage") );
 
     wxASSERT_MSG( pPage->GetParent() == this,
                     _T("notebook pages must have notebook as parent") );
 
 #if wxUSE_UXTHEME && wxUSE_UXTHEME_AUTO
                  _T("invalid index in wxNotebook::InsertPage") );
 
     wxASSERT_MSG( pPage->GetParent() == this,
                     _T("notebook pages must have notebook as parent") );
 
 #if wxUSE_UXTHEME && wxUSE_UXTHEME_AUTO

-    static bool g_TestedForTheme = FALSE;
-    static bool g_UseTheme = FALSE;
+    static bool g_TestedForTheme = false;
+    static bool g_UseTheme = false;

     if (!g_TestedForTheme)
     {
         int commCtrlVersion = wxTheApp->GetComCtl32Version() ;
         
         g_UseTheme = (commCtrlVersion >= 600);
     if (!g_TestedForTheme)
     {
         int commCtrlVersion = wxTheApp->GetComCtl32Version() ;
         
         g_UseTheme = (commCtrlVersion >= 600);

-        g_TestedForTheme = TRUE;
+        g_TestedForTheme = true;

     }
     
     // Automatically apply the theme background,
     }
     
     // Automatically apply the theme background,


@@ -617,16 +613,17 @@ bool wxNotebook::InsertPage(size_t nPage,
     {
         wxLogError(wxT("Can't create the notebook page '%s'."), strText.c_str());
 
     {
         wxLogError(wxT("Can't create the notebook page '%s'."), strText.c_str());
 

-        return FALSE;
+        return false;

     }
 
     // succeeded: save the pointer to the page
     m_pages.Insert(pPage, nPage);
 
     }
 
     // succeeded: save the pointer to the page
     m_pages.Insert(pPage, nPage);
 

-    // for the first page (only) we need to adjust the size again because the
-    // notebook size changed: the tabs which hadn't been there before are now
-    // shown
-    if ( m_pages.GetCount() == 1 )
+    // we may need to adjust the size again if the notebook size changed:
+    // normally this only happens for the first page we add (the tabs which
+    // hadn't been there before are now shown) but for a multiline notebook it
+    // can happen for any page at all as a new row could have been started
+    if ( m_pages.GetCount() == 1 || HasFlag(wxNB_MULTILINE) )

     {
         AdjustPageSize(pPage);
     }
     {
         AdjustPageSize(pPage);
     }


@@ -638,7 +635,7 @@ bool wxNotebook::InsertPage(size_t nPage,
 
     // this updates internal flag too -- otherwise it would get out of sync
     // with the real state
 
     // this updates internal flag too -- otherwise it would get out of sync
     // with the real state

-    pPage->Show(FALSE);
+    pPage->Show(false);

 
 
     // now deal with the selection
 
 
     // now deal with the selection


@@ -663,7 +660,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     if ( selNew != -1 )
         SetSelection(selNew);
 
     if ( selNew != -1 )
         SetSelection(selNew);
 

-    return TRUE;
+    return true;

 }
 
 int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
 }
 
 int wxNotebook::HitTest(const wxPoint& pt, long *flags) const


@@ -702,7 +699,30 @@ void wxNotebook::OnSize(wxSizeEvent& event)
   rc.left = rc.top = 0;
   GetSize((int *)&rc.right, (int *)&rc.bottom);
 
   rc.left = rc.top = 0;
   GetSize((int *)&rc.right, (int *)&rc.bottom);
 

-  TabCtrl_AdjustRect(m_hwnd, FALSE, &rc);
+  // there seems to be a bug in the implementation of TabCtrl_AdjustRect(): it
+  // returns completely false values for multiline tab controls after the tabs
+  // are added but before getting the first WM_SIZE (off by ~50 pixels, see
+  //
+  // http://sf.net/tracker/index.php?func=detail&aid=645323&group_id=9863&atid=109863
+  //
+  // and the only work around I could find was this ugly hack... without it
+  // simply toggling the "multiline" checkbox in the notebook sample resulted
+  // in a noticeable page displacement
+  if ( HasFlag(wxNB_MULTILINE) )
+  {
+      // avoid an infinite recursion: we get another notification too!
+      static bool s_isInOnSize = false;
+
+      if ( !s_isInOnSize )
+      {
+          s_isInOnSize = true;
+          SendMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED,
+                      MAKELPARAM(rc.right, rc.bottom));
+          s_isInOnSize = false;
+      }
+  }
+
+  TabCtrl_AdjustRect(m_hwnd, false, &rc);

 
   int width = rc.right - rc.left,
       height = rc.bottom - rc.top;
 
   int width = rc.right - rc.left,
       height = rc.bottom - rc.top;


@@ -722,14 +742,30 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event)
   {
       int sel = event.GetOldSelection();
       if ( sel != -1 )
   {
       int sel = event.GetOldSelection();
       if ( sel != -1 )

-        m_pages[sel]->Show(FALSE);
+        m_pages[sel]->Show(false);

 
       sel = event.GetSelection();
       if ( sel != -1 )
       {
         wxNotebookPage *pPage = m_pages[sel];
 
       sel = event.GetSelection();
       if ( sel != -1 )
       {
         wxNotebookPage *pPage = m_pages[sel];

-        pPage->Show(TRUE);
+        pPage->Show(true);

         pPage->SetFocus();
         pPage->SetFocus();

+
+        // If the newly focused window is not a child of the new page,
+        // SetFocus was not successful and the notebook itself should be
+        // focused
+        wxWindow *currentFocus = FindFocus();
+        wxWindow *startFocus = currentFocus;
+        while ( currentFocus && currentFocus != pPage && currentFocus != this )
+            currentFocus = currentFocus->GetParent();
+
+        if ( startFocus == pPage || currentFocus != pPage )
+            SetFocus();
+
+      }
+      else // no pages in the notebook, give the focus to itself
+      {
+          SetFocus();

       }
 
       m_nSelection = sel;
       }
 
       m_nSelection = sel;


@@ -739,18 +775,23 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event)
   event.Skip();
 }
 
   event.Skip();
 }
 

-void wxNotebook::OnSetFocus(wxFocusEvent& event)
+bool wxNotebook::MSWTranslateMessage(WXMSG *wxmsg)

 {
 {

-    // this function is only called when the focus is explicitly set (i.e. from
-    // the program) to the notebook - in this case we don't need the
-    // complicated OnNavigationKey() logic because the programmer knows better
-    // what [s]he wants
-
-    // set focus to the currently selected page if any
-    if ( m_nSelection != -1 )
-        m_pages[m_nSelection]->SetFocus();
+    const MSG * const msg = (MSG *)wxmsg;
+
+    // intercept TAB, CTRL+TAB and CTRL+SHIFT+TAB for processing by wxNotebook.
+    // TAB will be passed to the currently selected page, CTRL+TAB and
+    // CTRL+SHIFT+TAB will be processed by the notebook itself. do not
+    // intercept SHIFT+TAB. This goes to the parent of the notebook which will
+    // process it.
+    if ( msg->message == WM_KEYDOWN && msg->wParam == VK_TAB &&
+            msg->hwnd == m_hwnd &&
+                (wxIsCtrlDown() || !wxIsShiftDown()) )
+    {
+        return MSWProcessMessage(wxmsg);
+    }

 
 

-    event.Skip();
+    return false;

 }
 
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 }
 
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)


@@ -760,7 +801,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
         AdvanceSelection(event.GetDirection());
     }
     else {
         AdvanceSelection(event.GetDirection());
     }
     else {

-        // we get this event in 2 cases
+        // we get this event in 3 cases

         //
         // a) one of our pages might have generated it because the user TABbed
         // out from it in which case we should propagate the event upwards and
         //
         // a) one of our pages might have generated it because the user TABbed
         // out from it in which case we should propagate the event upwards and


@@ -773,12 +814,22 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
         // OnSetFocus() because we don't know which direction the focus came
         // from in this case and so can't choose between setting the focus to
         // first or last panel child
         // OnSetFocus() because we don't know which direction the focus came
         // from in this case and so can't choose between setting the focus to
         // first or last panel child

-        wxWindow *parent = GetParent();
-        // the cast is here to fic a GCC ICE
-        if ( ((wxWindow*)event.GetEventObject()) == parent )
+        //
+        // or
+        //
+        // c) we ourselves (see MSWTranslateMessage) generated the event
+        //
+        wxWindow * const parent = GetParent();
+
+        const bool isFromParent = event.GetEventObject() == parent;
+        const bool isFromSelf = event.GetEventObject() == this;
+
+        if ( isFromParent || isFromSelf )

         {
         {

-            // no, it doesn't come from child, case (b): forward to a page
-            if ( m_nSelection != -1 )
+            // no, it doesn't come from child, case (b) or (c): forward to a
+            // page but only if direction is backwards (TAB) or from ourselves,
+            if ( m_nSelection != -1 &&
+                    (!event.GetDirection() || isFromSelf) )

             {
                 // so that the page knows that the event comes from it's parent
                 // and is being propagated downwards
             {
                 // so that the page knows that the event comes from it's parent
                 // and is being propagated downwards


@@ -791,16 +842,23 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
                 }
                 //else: page manages focus inside it itself
             }
                 }
                 //else: page manages focus inside it itself
             }

-            else
+            else // otherwise set the focus to the notebook itself

             {
             {

-                // we have no pages - still have to give focus to _something_

                 SetFocus();
             }
         }
         else
         {
                 SetFocus();
             }
         }
         else
         {

-            // it comes from our child, case (a), pass to the parent
-            if ( parent ) {
+            // it comes from our child, case (a), pass to the parent, but only
+            // if the direction is forwards. Otherwise set the focus to the
+            // notebook itself. The notebook is always the 'first' control of a
+            // page.
+            if ( !event.GetDirection() )
+            {
+                SetFocus();
+            }
+            else if ( parent )
+            {

                 event.SetCurrentFocus(this);
                 parent->GetEventHandler()->ProcessEvent(event);
             }
                 event.SetCurrentFocus(this);
                 parent->GetEventHandler()->ProcessEvent(event);
             }


@@ -819,12 +877,12 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 void wxNotebook::SetConstraintSizes(bool WXUNUSED(recurse))
 {
   // don't set the sizes of the pages - their correct size is not yet known
 void wxNotebook::SetConstraintSizes(bool WXUNUSED(recurse))
 {
   // don't set the sizes of the pages - their correct size is not yet known

-  wxControl::SetConstraintSizes(FALSE);
+  wxControl::SetConstraintSizes(false);

 }
 
 bool wxNotebook::DoPhase(int WXUNUSED(nPhase))
 {
 }
 
 bool wxNotebook::DoPhase(int WXUNUSED(nPhase))
 {

-  return TRUE;
+  return true;

 }
 
 #endif // wxUSE_CONSTRAINTS
 }
 
 #endif // wxUSE_CONSTRAINTS


@@ -839,7 +897,7 @@ bool wxNotebook::MSWOnScroll(int orientation, WXWORD nSBCode,
     // don't generate EVT_SCROLLWIN events for the WM_SCROLLs coming from the
     // up-down control
     if ( control )
     // don't generate EVT_SCROLLWIN events for the WM_SCROLLs coming from the
     // up-down control
     if ( control )

-        return FALSE;
+        return false;

 
     return wxNotebookBase::MSWOnScroll(orientation, nSBCode, pos, control);
 }
 
     return wxNotebookBase::MSWOnScroll(orientation, nSBCode, pos, control);
 }


@@ -940,10 +998,11 @@ void wxNotebook::ApplyThemeBackground(wxWindow*, const wxColour&)
 #endif
 }
 
 #endif
 }
 

+#if wxUSE_UXTHEME

 long wxNotebook::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 long wxNotebook::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {

-    static bool g_TestedForTheme = FALSE;
-    static bool g_UseTheme = FALSE;
+    static bool g_TestedForTheme = false;
+    static bool g_supportsThemes = false;

     switch ( nMsg )
     {
         case WM_ERASEBKGND:
     switch ( nMsg )
     {
         case WM_ERASEBKGND:


@@ -952,19 +1011,25 @@ long wxNotebook::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             {
                 int commCtrlVersion = wxTheApp->GetComCtl32Version() ;
 
             {
                 int commCtrlVersion = wxTheApp->GetComCtl32Version() ;
 

-                g_UseTheme = (commCtrlVersion >= 600);
-                g_TestedForTheme = TRUE;
+                g_supportsThemes = (commCtrlVersion >= 600);
+                g_TestedForTheme = true;

             }
 
             }
 

-            // If using XP themes, it seems we can get away
+            // If currently an XP theme is active, it seems we can get away

             // with not drawing a background, which reduces flicker.
             // with not drawing a background, which reduces flicker.

-            if (g_UseTheme)            
-                return TRUE;
+            if (g_supportsThemes)
+            {
+                wxUxThemeEngine *p = wxUxThemeEngine::Get();
+                if (p && p->IsThemeActive() )
+                {
+                    return true;
+                }
+            }

         }
     }
 
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }
         }
     }
 
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }

-
+#endif // #if wxUSE_UXTHEME

 
 #endif // wxUSE_NOTEBOOK
 
 #endif // wxUSE_NOTEBOOK