define UDM_{SETRANGE|SETPOS|GETPOS}32 if we don't have them in the headers to allow...

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index c8663ee71d0afb2cc80b9aa24cb0c1358adba308..80f2fc703076e221fb3c790b5d4388759fbbdeed 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/notebook.cpp
+// Name:        src/msw/notebook.cpp

 // Purpose:     implementation of wxNotebook
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxNotebook
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "notebook.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -57,15 +53,14 @@
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
 
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
 

-// hide the ugly cast
-#define m_hwnd    (HWND)GetHWND()
-
+// you can set USE_NOTEBOOK_ANTIFLICKER to 0 for desktop Windows versions too
+// to disable code whih results in flicker-less notebook redrawing at the
+// expense of some extra GDI resource consumption

 #ifdef __WXWINCE__
 #ifdef __WXWINCE__

-#define USE_NOTEBOOK_ANTIFLICKER    0
+    // notebooks are never resized under CE anyhow
+    #define USE_NOTEBOOK_ANTIFLICKER    0

 #else
 #else

-// Set this to 1 to compile anti-flicker code, which creates a potentially
-// large bitmap for every paint event
-#define USE_NOTEBOOK_ANTIFLICKER    0
+    #define USE_NOTEBOOK_ANTIFLICKER    1

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -85,25 +80,45 @@
     #define TCS_BOTTOM      TCS_RIGHT
 #endif
 
     #define TCS_BOTTOM      TCS_RIGHT
 #endif
 

+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------
+
+#if USE_NOTEBOOK_ANTIFLICKER
+
+// the pointer to standard spin button wnd proc
+static WXFARPROC gs_wndprocNotebookSpinBtn = (WXFARPROC)NULL;
+
+// the pointer to standard tab control wnd proc
+static WXFARPROC gs_wndprocNotebook = (WXFARPROC)NULL;
+
+LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd,
+                                           UINT message,
+                                           WPARAM wParam,
+                                           LPARAM lParam);
+
+#endif // USE_NOTEBOOK_ANTIFLICKER
+

 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------
 

-#include <wx/listimpl.cpp>
+#include "wx/listimpl.cpp"

 
 

-WX_DEFINE_LIST( wxNotebookPageInfoList ) ;
+WX_DEFINE_LIST( wxNotebookPageInfoList )

 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)

+    EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)
+    EVT_SIZE(wxNotebook::OnSize)
+    EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
+

 #if USE_NOTEBOOK_ANTIFLICKER
     EVT_ERASE_BACKGROUND(wxNotebook::OnEraseBackground)
     EVT_PAINT(wxNotebook::OnPaint)
 #if USE_NOTEBOOK_ANTIFLICKER
     EVT_ERASE_BACKGROUND(wxNotebook::OnEraseBackground)
     EVT_PAINT(wxNotebook::OnPaint)

-#endif        
-    EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
-    EVT_SIZE(wxNotebook::OnSize)
-    EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
+#endif // USE_NOTEBOOK_ANTIFLICKER

 END_EVENT_TABLE()
 
 #if wxUSE_EXTENDED_RTTI
 END_EVENT_TABLE()
 
 #if wxUSE_EXTENDED_RTTI


@@ -138,9 +153,11 @@ wxBEGIN_FLAGS( wxNotebookStyle )
     wxFLAGS_MEMBER(wxHSCROLL)
 
     wxFLAGS_MEMBER(wxNB_FIXEDWIDTH)
     wxFLAGS_MEMBER(wxHSCROLL)
 
     wxFLAGS_MEMBER(wxNB_FIXEDWIDTH)

-    wxFLAGS_MEMBER(wxNB_LEFT)
-    wxFLAGS_MEMBER(wxNB_RIGHT)
-    wxFLAGS_MEMBER(wxNB_BOTTOM)
+    wxFLAGS_MEMBER(wxBK_DEFAULT)
+    wxFLAGS_MEMBER(wxBK_TOP)
+    wxFLAGS_MEMBER(wxBK_LEFT)
+    wxFLAGS_MEMBER(wxBK_RIGHT)
+    wxFLAGS_MEMBER(wxBK_BOTTOM)

     wxFLAGS_MEMBER(wxNB_NOPAGETHEME)
     wxFLAGS_MEMBER(wxNB_FLAT)
 
     wxFLAGS_MEMBER(wxNB_NOPAGETHEME)
     wxFLAGS_MEMBER(wxNB_FLAT)
 


@@ -188,25 +205,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookPageInfo, wxObject )
 #endif
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
 
 #endif
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
 

-// ---------------------------------------------------------------------------
-// private functions
-// ---------------------------------------------------------------------------
-
-#if USE_NOTEBOOK_ANTIFLICKER
-// wnd proc for the spin button
-LRESULT APIENTRY _EXPORT wxNotebookSpinBtnWndProc(HWND hWnd,
-                                                  UINT message,
-                                                  WPARAM wParam,
-                                                  LPARAM lParam);
-
-// ---------------------------------------------------------------------------
-// global vars
-// ---------------------------------------------------------------------------
-
-// the pointer to standard spin button wnd proc
-static WXFARPROC s_wndprocNotebookSpinBtn = (WXFARPROC)NULL;
-#endif
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -231,12 +229,16 @@ const wxNotebookPageInfoList& wxNotebook::GetPageInfos() const
 // common part of all ctors
 void wxNotebook::Init()
 {
 // common part of all ctors
 void wxNotebook::Init()
 {

-  m_imageList = NULL;
-  m_nSelection = -1;
+    m_imageList = NULL;
+    m_nSelection = -1;

 
 #if wxUSE_UXTHEME
 
 #if wxUSE_UXTHEME

-  m_hbrBackground = NULL;
+    m_hbrBackground = NULL;

 #endif // wxUSE_UXTHEME
 #endif // wxUSE_UXTHEME

+
+#if USE_NOTEBOOK_ANTIFLICKER
+    m_hasSubclassedUpdown = false;
+#endif // USE_NOTEBOOK_ANTIFLICKER

 }
 
 // default for dynamic class
 }
 
 // default for dynamic class


@@ -273,22 +275,20 @@ bool wxNotebook::Create(wxWindow *parent,
         style |= wxBORDER_SUNKEN;
 #endif
 
         style |= wxBORDER_SUNKEN;
 #endif
 

-    // comctl32.dll 6.0 doesn't support non-top tabs with visual styles (the
-    // control is simply not rendered correctly), so disable them in this case
+#if !wxUSE_UXTHEME 
+    // ComCtl32 notebook tabs simply don't work unless they're on top if we have uxtheme, we can
+    // work around it later (after control creation), but if we don't have uxtheme, we have to clear
+    // those styles

     const int verComCtl32 = wxApp::GetComCtl32Version();
     if ( verComCtl32 == 600 )
     {
     const int verComCtl32 = wxApp::GetComCtl32Version();
     if ( verComCtl32 == 600 )
     {

-        // check if we use themes at all -- if we don't, we're still ok
-#if wxUSE_UXTHEME
-        if ( wxUxThemeEngine::GetIfActive() )
-#endif
-        {
-            style &= ~(wxNB_BOTTOM | wxNB_LEFT | wxNB_RIGHT);
-        }
+        style &= ~(wxBK_BOTTOM | wxBK_LEFT | wxBK_RIGHT);

     }
     }

+#endif //wxUSE_UXTHEME

 
     LPCTSTR className = WC_TABCONTROL;
 
 
     LPCTSTR className = WC_TABCONTROL;
 

+#if USE_NOTEBOOK_ANTIFLICKER

     // SysTabCtl32 class has natively CS_HREDRAW and CS_VREDRAW enabled and it
     // causes horrible flicker when resizing notebook, so get rid of it by
     // using a class without these styles (but otherwise identical to it)
     // SysTabCtl32 class has natively CS_HREDRAW and CS_VREDRAW enabled and it
     // causes horrible flicker when resizing notebook, so get rid of it by
     // using a class without these styles (but otherwise identical to it)


@@ -300,11 +300,14 @@ bool wxNotebook::Create(wxWindow *parent,
             // get a copy of standard class and modify it
             WNDCLASS wc;
 
             // get a copy of standard class and modify it
             WNDCLASS wc;
 

-            if ( ::GetClassInfo(::GetModuleHandle(NULL), WC_TABCONTROL, &wc) )
+            if ( ::GetClassInfo(NULL, WC_TABCONTROL, &wc) )

             {
             {

+                gs_wndprocNotebook =
+                    wx_reinterpret_cast(WXFARPROC, wc.lpfnWndProc);

                 wc.lpszClassName = wxT("_wx_SysTabCtl32");
                 wc.style &= ~(CS_HREDRAW | CS_VREDRAW);
                 wc.lpszClassName = wxT("_wx_SysTabCtl32");
                 wc.style &= ~(CS_HREDRAW | CS_VREDRAW);

-
+                wc.hInstance = wxGetInstance();
+                wc.lpfnWndProc = wxNotebookWndProc;

                 s_clsNotebook.Register(wc);
             }
             else
                 s_clsNotebook.Register(wc);
             }
             else


@@ -322,6 +325,7 @@ bool wxNotebook::Create(wxWindow *parent,
             className = s_clsNotebook.GetName().c_str();
         }
     }
             className = s_clsNotebook.GetName().c_str();
         }
     }

+#endif // USE_NOTEBOOK_ANTIFLICKER

 
     if ( !CreateControl(parent, id, pos, size, style | wxTAB_TRAVERSAL,
                         wxDefaultValidator, name) )
 
     if ( !CreateControl(parent, id, pos, size, style | wxTAB_TRAVERSAL,
                         wxDefaultValidator, name) )


@@ -336,6 +340,27 @@ bool wxNotebook::Create(wxWindow *parent,
     {
         SetBackgroundColour(GetThemeBackgroundColour());
     }
     {
         SetBackgroundColour(GetThemeBackgroundColour());
     }

+    else // use themed background by default
+    {
+        // create backing store
+        UpdateBgBrush();
+    }
+    
+    // comctl32.dll 6.0 doesn't support non-top tabs with visual styles (the
+    // control is simply not rendered correctly), so we disable themes
+    // if possible, otherwise we simply clear the styles.
+    // It's probably not possible to have UXTHEME without ComCtl32 6 or better, but lets
+    // check it anyway.
+    const int verComCtl32 = wxApp::GetComCtl32Version();
+    if ( verComCtl32 == 600 ) 
+    {
+        // check if we use themes at all -- if we don't, we're still okay
+        if ( wxUxThemeEngine::GetIfActive() && (style & (wxBK_BOTTOM|wxBK_LEFT|wxBK_RIGHT)))
+        {
+            wxUxThemeEngine::GetIfActive()->SetWindowTheme((HWND)this->GetHandle(), L"", L"");
+            SetBackgroundColour(GetThemeBackgroundColour());    //correct the background color for the new non-themed control
+        }
+    }

 #endif // wxUSE_UXTHEME
 
     // Undocumented hack to get flat notebook style
 #endif // wxUSE_UXTHEME
 
     // Undocumented hack to get flat notebook style


@@ -345,7 +370,7 @@ bool wxNotebook::Create(wxWindow *parent,
 #if defined(__POCKETPC__) || defined(__SMARTPHONE__)
     if (HasFlag(wxNB_FLAT))
     {
 #if defined(__POCKETPC__) || defined(__SMARTPHONE__)
     if (HasFlag(wxNB_FLAT))
     {

-        SendMessage(m_hwnd, CCM_SETVERSION, COMCTL32_VERSION, 0);
+        SendMessage(GetHwnd(), CCM_SETVERSION, COMCTL32_VERSION, 0);

         if (!m_hasBgCol)
             SetBackgroundColour(*wxWHITE);
     }
         if (!m_hasBgCol)
             SetBackgroundColour(*wxWHITE);
     }


@@ -364,11 +389,11 @@ WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const
     if ( style & wxNB_FIXEDWIDTH )
         tabStyle |= TCS_FIXEDWIDTH;
 
     if ( style & wxNB_FIXEDWIDTH )
         tabStyle |= TCS_FIXEDWIDTH;
 

-    if ( style & wxNB_BOTTOM )
+    if ( style & wxBK_BOTTOM )

         tabStyle |= TCS_RIGHT;
         tabStyle |= TCS_RIGHT;

-    else if ( style & wxNB_LEFT )
+    else if ( style & wxBK_LEFT )

         tabStyle |= TCS_VERTICAL;
         tabStyle |= TCS_VERTICAL;

-    else if ( style & wxNB_RIGHT )
+    else if ( style & wxBK_RIGHT )

         tabStyle |= TCS_VERTICAL | TCS_RIGHT;
 
     // ex style
         tabStyle |= TCS_VERTICAL | TCS_RIGHT;
 
     // ex style


@@ -396,97 +421,112 @@ wxNotebook::~wxNotebook()
 
 size_t wxNotebook::GetPageCount() const
 {
 
 size_t wxNotebook::GetPageCount() const
 {

-  // consistency check
-  wxASSERT( (int)m_pages.Count() == TabCtrl_GetItemCount(m_hwnd) );
+    // consistency check
+    wxASSERT( (int)m_pages.Count() == TabCtrl_GetItemCount(GetHwnd()) );

 
 

-  return m_pages.Count();
+    return m_pages.Count();

 }
 
 int wxNotebook::GetRowCount() const
 {
 }
 
 int wxNotebook::GetRowCount() const
 {

-  return TabCtrl_GetRowCount(m_hwnd);
+    return TabCtrl_GetRowCount(GetHwnd());

 }
 
 int wxNotebook::SetSelection(size_t nPage)
 {
 }
 
 int wxNotebook::SetSelection(size_t nPage)
 {

-  wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") );

 
 

-  if ( int(nPage) != m_nSelection )
-  {
-    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
-    event.SetSelection(nPage);
-    event.SetOldSelection(m_nSelection);
-    event.SetEventObject(this);
-    if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
+    if ( int(nPage) != m_nSelection )

     {
     {

-      // program allows the page change
-      event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
-      (void)GetEventHandler()->ProcessEvent(event);
+        wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
+        event.SetSelection(nPage);
+        event.SetOldSelection(m_nSelection);
+        event.SetEventObject(this);
+        if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
+        {
+            // program allows the page change
+            event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
+           (void)GetEventHandler()->ProcessEvent(event);

 
 

-      TabCtrl_SetCurSel(m_hwnd, nPage);
+           TabCtrl_SetCurSel(GetHwnd(), nPage);
+        }

     }
     }

-  }

 
 

-  return m_nSelection;
+    return m_nSelection;

 }
 
 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;
-  tcItem.pszText = (wxChar *)strText.c_str();
+    TC_ITEM tcItem;
+    tcItem.mask = TCIF_TEXT;
+    tcItem.pszText = (wxChar *)strText.c_str();
+
+    if ( !HasFlag(wxNB_MULTILINE) )
+        return TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0;

 
 

-  return TabCtrl_SetItem(m_hwnd, nPage, &tcItem) != 0;
+    // multiline - we need to set new page size if a line is added or removed
+    int rows = GetRowCount();
+    bool ret = TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0;
+
+    if ( ret && rows != GetRowCount() )
+    {
+        const wxRect r = GetPageSize();
+        const size_t count = m_pages.Count();
+        for ( size_t page = 0; page < count; page++ )
+            m_pages[page]->SetSize(r);
+    }
+
+    return ret;

 }
 
 wxString wxNotebook::GetPageText(size_t 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") );

 
 

-  wxChar buf[256];
-  TC_ITEM tcItem;
-  tcItem.mask = TCIF_TEXT;
-  tcItem.pszText = buf;
-  tcItem.cchTextMax = WXSIZEOF(buf);
+    wxChar buf[256];
+    TC_ITEM tcItem;
+    tcItem.mask = TCIF_TEXT;
+    tcItem.pszText = buf;
+    tcItem.cchTextMax = WXSIZEOF(buf);

 
 

-  wxString str;
-  if ( TabCtrl_GetItem(m_hwnd, nPage, &tcItem) )
-    str = tcItem.pszText;
+    wxString str;
+    if ( TabCtrl_GetItem(GetHwnd(), nPage, &tcItem) )
+        str = tcItem.pszText;

 
 

-  return str;
+    return str;

 }
 
 int wxNotebook::GetPageImage(size_t 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), wxNOT_FOUND, wxT("notebook page out of range") );

 
 

-  TC_ITEM tcItem;
-  tcItem.mask = TCIF_IMAGE;
+    TC_ITEM tcItem;
+    tcItem.mask = TCIF_IMAGE;

 
 

-  return TabCtrl_GetItem(m_hwnd, nPage, &tcItem) ? tcItem.iImage : -1;
+    return TabCtrl_GetItem(GetHwnd(), nPage, &tcItem) ? tcItem.iImage : wxNOT_FOUND;

 }
 
 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;
-  tcItem.iImage = nImage;
+    TC_ITEM tcItem;
+    tcItem.mask = TCIF_IMAGE;
+    tcItem.iImage = nImage;

 
 

-  return TabCtrl_SetItem(m_hwnd, nPage, &tcItem) != 0;
+    return TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0;

 }
 
 void wxNotebook::SetImageList(wxImageList* imageList)
 {
 }
 
 void wxNotebook::SetImageList(wxImageList* imageList)
 {

-  wxNotebookBase::SetImageList(imageList);
+    wxNotebookBase::SetImageList(imageList);

 
 

-  if ( imageList )
-  {
-    TabCtrl_SetImageList(m_hwnd, (HIMAGELIST)imageList->GetHIMAGELIST());
-  }
+    if ( imageList )
+    {
+        (void) TabCtrl_SetImageList(GetHwnd(), (HIMAGELIST)imageList->GetHIMAGELIST());
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -501,14 +541,14 @@ wxRect wxNotebook::GetPageSize() const
     ::GetClientRect(GetHwnd(), &rc);
 
     // This check is to work around a bug in TabCtrl_AdjustRect which will
     ::GetClientRect(GetHwnd(), &rc);
 
     // This check is to work around a bug in TabCtrl_AdjustRect which will

-    // cause a crash on win2k, or on XP with themes disabled, if the
-    // wxNB_MULTILINE style is used and the rectangle is very small, (such as
-    // when the notebook is first created.)  The value of 20 is just
-    // arbitrarily chosen, if there is a better way to determine this value
-    // then please do so.  --RD
-    if ( !HasFlag(wxNB_MULTILINE) || (rc.right > 20 && rc.bottom > 20) )
+    // cause a crash on win2k or on XP with themes disabled if either
+    // wxNB_MULTILINE is used or tabs are placed on a side, if the rectangle
+    // is too small.
+    //
+    // The value of 20 is chosen arbitrarily but seems to work
+    if ( rc.right > 20 && rc.bottom > 20 )

     {
     {

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

 
         wxCopyRECTToRect(rc, r);
     }
 
         wxCopyRECTToRect(rc, r);
     }


@@ -556,7 +596,7 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
         tabSize.x = rect.right - rect.left;
         tabSize.y = rect.bottom - rect.top;
     }
         tabSize.x = rect.right - rect.left;
         tabSize.y = rect.bottom - rect.top;
     }

-    if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
+    if ( HasFlag(wxBK_LEFT) || HasFlag(wxBK_RIGHT) )

     {
         sizeTotal.x += tabSize.x + 7;
         sizeTotal.y += 7;
     {
         sizeTotal.x += tabSize.x + 7;
         sizeTotal.y += 7;


@@ -592,7 +632,7 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
     if ( !pageRemoved )
         return NULL;
 
     if ( !pageRemoved )
         return NULL;
 

-    TabCtrl_DeleteItem(m_hwnd, nPage);
+    TabCtrl_DeleteItem(GetHwnd(), nPage);

 
     if ( m_pages.IsEmpty() )
     {
 
     if ( m_pages.IsEmpty() )
     {


@@ -601,7 +641,7 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
     }
     else // notebook still not empty
     {
     }
     else // notebook still not empty
     {

-        int selNew = TabCtrl_GetCurSel(m_hwnd);
+        int selNew = TabCtrl_GetCurSel(GetHwnd());

         if (selNew != -1)
         {
             // No selection change, just refresh the current selection.
         if (selNew != -1)
         {
             // No selection change, just refresh the current selection.


@@ -638,19 +678,19 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {

-  size_t nPageCount = GetPageCount();
-  size_t nPage;
-  for ( nPage = 0; nPage < nPageCount; nPage++ )
-    delete m_pages[nPage];
+    size_t nPageCount = GetPageCount();
+    size_t nPage;
+    for ( nPage = 0; nPage < nPageCount; nPage++ )
+        delete m_pages[nPage];

 
 

-  m_pages.Clear();
+    m_pages.Clear();

 
 

-  TabCtrl_DeleteAllItems(m_hwnd);
+    TabCtrl_DeleteAllItems(GetHwnd());

 
 

-  m_nSelection = -1;
+    m_nSelection = -1;

 
 

-  InvalidateBestSize();
-  return true;
+    InvalidateBestSize();
+    return true;

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


@@ -704,7 +744,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     AdjustPageSize(pPage);
 
     // finally do insert it
     AdjustPageSize(pPage);
 
     // finally do insert it

-    if ( TabCtrl_InsertItem(m_hwnd, nPage, &tcItem) == -1 )
+    if ( TabCtrl_InsertItem(GetHwnd(), nPage, &tcItem) == -1 )

     {
         wxLogError(wxT("Can't create the notebook page '%s'."), strText.c_str());
 
     {
         wxLogError(wxT("Can't create the notebook page '%s'."), strText.c_str());
 


@@ -774,6 +814,69 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
     return item;
 }
 
     return item;
 }
 

+// ----------------------------------------------------------------------------
+// flicker-less notebook redraw
+// ----------------------------------------------------------------------------
+
+#if USE_NOTEBOOK_ANTIFLICKER
+
+// wnd proc for the spin button
+LRESULT APIENTRY _EXPORT wxNotebookSpinBtnWndProc(HWND hwnd,
+                                                  UINT message,
+                                                  WPARAM wParam,
+                                                  LPARAM lParam)
+{
+    if ( message == WM_ERASEBKGND )
+        return 0;
+
+    return ::CallWindowProc(CASTWNDPROC gs_wndprocNotebookSpinBtn,
+                            hwnd, message, wParam, lParam);
+}
+
+LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd,
+                                           UINT message,
+                                           WPARAM wParam,
+                                           LPARAM lParam)
+{
+    return ::CallWindowProc(CASTWNDPROC gs_wndprocNotebook,
+                            hwnd, message, wParam, lParam);
+}
+
+void wxNotebook::OnEraseBackground(wxEraseEvent& WXUNUSED(event))
+{
+    // do nothing here
+}
+
+void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event))
+{
+    wxPaintDC dc(this);
+    wxMemoryDC memdc;
+    RECT rc;
+    ::GetClientRect(GetHwnd(), &rc);
+    wxBitmap bmp(rc.right, rc.bottom);
+    memdc.SelectObject(bmp);
+
+    // if there is no special brush just use the solid background colour
+#if wxUSE_UXTHEME
+    HBRUSH hbr = (HBRUSH)m_hbrBackground;
+#else
+    HBRUSH hbr = 0;
+#endif    
+    wxBrush brush;
+    if ( !hbr )
+    {
+        brush = wxBrush(GetBackgroundColour());
+        hbr = GetHbrushOf(brush);
+    }
+
+    ::FillRect(GetHdcOf(memdc), &rc, hbr);
+
+    MSWDefWindowProc(WM_PAINT, (WPARAM)memdc.GetHDC(), 0);
+
+    dc.Blit(0, 0, rc.right, rc.bottom, &memdc, 0, 0);
+}
+
+#endif // USE_NOTEBOOK_ANTIFLICKER

 
 // ----------------------------------------------------------------------------
 // wxNotebook callbacks
 
 // ----------------------------------------------------------------------------
 // wxNotebook callbacks


@@ -797,22 +900,22 @@ void wxNotebook::OnSize(wxSizeEvent& event)
         // This needs to be reconciled with the RefreshRect calls
         // at the end of this function, which weren't enough to prevent
         // the droppings.
         // This needs to be reconciled with the RefreshRect calls
         // at the end of this function, which weren't enough to prevent
         // the droppings.

-        
+

         wxSize sz = GetClientSize();
 
         // Refresh right side
         wxRect rect(sz.x-4, 0, 4, sz.y);
         RefreshRect(rect);
         wxSize sz = GetClientSize();
 
         // Refresh right side
         wxRect rect(sz.x-4, 0, 4, sz.y);
         RefreshRect(rect);

-        
+

         // Refresh bottom side
         rect = wxRect(0, sz.y-4, sz.x, 4);
         RefreshRect(rect);
         // Refresh bottom side
         rect = wxRect(0, sz.y-4, sz.x, 4);
         RefreshRect(rect);

-        
+

         // Refresh left side
         rect = wxRect(0, 0, 4, sz.y);
         RefreshRect(rect);
     }
         // Refresh left side
         rect = wxRect(0, 0, 4, sz.y);
         RefreshRect(rect);
     }

-#endif
+#endif // !__WXWINCE__

 
     // fit all the notebook pages to the tab control's display area
 
 
     // fit all the notebook pages to the tab control's display area
 


@@ -852,7 +955,7 @@ void wxNotebook::OnSize(wxSizeEvent& event)
     UpdateBgBrush();
 #endif // wxUSE_UXTHEME
 
     UpdateBgBrush();
 #endif // wxUSE_UXTHEME
 

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

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


@@ -871,10 +974,38 @@ void wxNotebook::OnSize(wxSizeEvent& event)
         RefreshRect(wxRect(0, rc.top, rc.left, height), false);
         RefreshRect(wxRect(0, rc.bottom, widthNbook, heightNbook - rc.bottom),
                     false);
         RefreshRect(wxRect(0, rc.top, rc.left, height), false);
         RefreshRect(wxRect(0, rc.bottom, widthNbook, heightNbook - rc.bottom),
                     false);

-        RefreshRect(wxRect(rc.right, rc.top, widthNbook - rc.bottom, height),
+        RefreshRect(wxRect(rc.right, rc.top, widthNbook - rc.right, height),

                     false);
     }
 
                     false);
     }
 

+#if USE_NOTEBOOK_ANTIFLICKER
+    // subclass the spin control used by the notebook to scroll pages to
+    // prevent it from flickering on resize
+    if ( !m_hasSubclassedUpdown )
+    {
+        // iterate over all child windows to find spin button
+        for ( HWND child = ::GetWindow(GetHwnd(), GW_CHILD);
+              child;
+              child = ::GetWindow(child, GW_HWNDNEXT) )
+        {
+            wxWindow *childWindow = wxFindWinFromHandle((WXHWND)child);
+
+            // see if it exists, if no wxWindow found then assume it's the spin
+            // btn
+            if ( !childWindow )
+            {
+                // subclass the spin button to override WM_ERASEBKGND
+                if ( !gs_wndprocNotebookSpinBtn )
+                    gs_wndprocNotebookSpinBtn = (WXFARPROC)wxGetWindowProc(child);
+
+                wxSetWindowProc(child, wxNotebookSpinBtnWndProc);
+                m_hasSubclassedUpdown = true;
+                break;
+            }
+        }
+    }
+#endif // USE_NOTEBOOK_ANTIFLICKER
+

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -892,24 +1023,17 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event)
       {
         wxNotebookPage *pPage = m_pages[sel];
         pPage->Show(true);
       {
         wxNotebookPage *pPage = m_pages[sel];
         pPage->Show(true);

-        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();
+      // Changing the page should give the focus to it but, as per bug report
+      // http://sf.net/tracker/index.php?func=detail&aid=1150659&group_id=9863&atid=109863,
+      // we should not set the focus to it directly since it erroneously
+      // selects radio buttons and breaks keyboard handling for a notebook's
+      // scroll buttons. So give focus to the notebook and not the page.

 
 

-        if ( startFocus == pPage || currentFocus != pPage )
-            SetFocus();
-
-      }
-      else // no pages in the notebook, give the focus to itself
-      {
-          SetFocus();
-      }
+      // but don't do this is the notebook is hidden
+      if ( ::IsWindowVisible(GetHwnd()) )
+        SetFocus();

 
       m_nSelection = sel;
   }
 
       m_nSelection = sel;
   }


@@ -928,7 +1052,7 @@ bool wxNotebook::MSWTranslateMessage(WXMSG *wxmsg)
     // intercept SHIFT+TAB. This goes to the parent of the notebook which will
     // process it.
     if ( msg->message == WM_KEYDOWN && msg->wParam == VK_TAB &&
     // 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 &&
+            msg->hwnd == GetHwnd() &&

                 (wxIsCtrlDown() || !wxIsShiftDown()) )
     {
         return MSWProcessMessage(wxmsg);
                 (wxIsCtrlDown() || !wxIsShiftDown()) )
     {
         return MSWProcessMessage(wxmsg);


@@ -1031,21 +1155,21 @@ bool wxNotebook::DoDrawBackground(WXHDC hDC, wxWindow *child)
     if ( child )
         ::MapWindowPoints(GetHwnd(), GetHwndOf(child), (POINT *)&rc, 2);
 
     if ( child )
         ::MapWindowPoints(GetHwnd(), GetHwndOf(child), (POINT *)&rc, 2);
 

-
-    // apparently DrawThemeBackground() modifies the rect passed to it and if we
-    // don't do these adjustments, there are some drawing artifacts which are
-    // only visible with some non default themes; so modify the rect here using
-    // the magic numbers below so that it still paints the correct area
-    rc.left   -= 2;
-    rc.top    -= 2;
-    rc.right  += 4;
-    rc.bottom += 5;
-
-
+    // we have the content area (page size), but we need to draw all of the
+    // background for it to be aligned correctly
+    wxUxThemeEngine::Get()->GetThemeBackgroundExtent
+                            (
+                                theme,
+                                (HDC) hDC,
+                                9 /* TABP_PANE */,
+                                0,
+                                &rc,
+                                &rc
+                            );

     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 theme,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 theme,

-                                hDC,
+                                (HDC) hDC,

                                 9 /* TABP_PANE */,
                                 0,
                                 &rc,
                                 9 /* TABP_PANE */,
                                 0,
                                 &rc,


@@ -1133,7 +1257,7 @@ bool wxNotebook::MSWPrintChild(WXHDC hDC, wxWindow *child)
 
         wxBrush brush(GetBackgroundColour());
         HBRUSH hbr = GetHbrushOf(brush);
 
         wxBrush brush(GetBackgroundColour());
         HBRUSH hbr = GetHbrushOf(brush);

-       
+

         ::FillRect((HDC) hDC, &rc, hbr);
 
         return true;
         ::FillRect((HDC) hDC, &rc, hbr);
 
         return true;


@@ -1244,7 +1368,7 @@ bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result)
       return wxControl::MSWOnNotify(idCtrl, lParam, result);
   }
 
       return wxControl::MSWOnNotify(idCtrl, lParam, result);
   }
 

-  event.SetSelection(TabCtrl_GetCurSel(m_hwnd));
+  event.SetSelection(TabCtrl_GetCurSel(GetHwnd()));

   event.SetOldSelection(m_nSelection);
   event.SetEventObject(this);
   event.SetInt(idCtrl);
   event.SetOldSelection(m_nSelection);
   event.SetEventObject(this);
   event.SetInt(idCtrl);


@@ -1254,79 +1378,4 @@ bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result)
   return processed;
 }
 
   return processed;
 }
 

-#ifndef __WXWINCE__
-void wxNotebook::OnEraseBackground(wxEraseEvent& WXUNUSED(event))
-{
-    // do nothing here
-}
-
-void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    // Better painting behaviour, at the expense of system resources
-#if USE_NOTEBOOK_ANTIFLICKER
-    wxPaintDC dc(this);
-    wxMemoryDC memdc;
-    RECT rc;
-    ::GetClientRect(GetHwnd(), &rc);
-    wxBitmap bmp(rc.right, rc.bottom);
-    memdc.SelectObject(bmp);
-
-    // iterate over all child windows to find spin button
-    for ( HWND child = ::GetWindow(GetHwnd(), GW_CHILD);
-          child;
-          child = ::GetWindow(child, GW_HWNDNEXT) )
-    {
-        wxWindow *childWindow = wxFindWinFromHandle((WXHWND)child);
-
-        // see if it exists, if no wxWindow found then assume it's the spin btn
-        if ( !childWindow )
-        {
-            // subclass the spin button to override WM_ERASEBKGND
-            if ( !s_wndprocNotebookSpinBtn )
-                s_wndprocNotebookSpinBtn = (WXFARPROC)wxGetWindowProc(child);
-
-            wxSetWindowProc(child, wxNotebookSpinBtnWndProc);
-           break;
-        }
-    }
-
-    HBRUSH hbr = (HBRUSH)m_hbrBackground;
-
-    // if there is no special brush just use the solid background colour
-    wxBrush brush;
-    if ( !hbr )
-    {
-        brush = wxBrush(GetBackgroundColour());
-        hbr = GetHbrushOf(brush);
-    }
-
-    ::FillRect(GetHdcOf(memdc), &rc, hbr);
-
-    MSWDefWindowProc(WM_PAINT, (WPARAM)memdc.GetHDC(), 0);
-
-    dc.Blit(0, 0, rc.right, rc.bottom, &memdc, 0, 0);
-#endif
-}
-#endif
-  // __WXWINCE__
-
-#if USE_NOTEBOOK_ANTIFLICKER
-// ---------------------------------------------------------------------------
-// window proc for spin button
-// ---------------------------------------------------------------------------
-
-LRESULT APIENTRY _EXPORT wxNotebookSpinBtnWndProc(HWND hwnd,
-                                                  UINT message,
-                                                  WPARAM wParam,
-                                                  LPARAM lParam)
-{
-    if ( message == WM_ERASEBKGND )
-        return 0;
-
-    return ::CallWindowProc(CASTWNDPROC s_wndprocNotebookSpinBtn, hwnd, message, wParam, lParam);
-}
-
-#endif
-    // USE_NOTEBOOK_ANTIFLICKER
-    

 #endif // wxUSE_NOTEBOOK
 #endif // wxUSE_NOTEBOOK