why was this class made a wxControlContainer (rev. 1.7), this doesn't seem to make...

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

diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index d3d4b29fe1b982e757a0f35b69aa6662747fc783..392f13c4aa5a6c9c6684b0e4279f0762b7963a44 100644 (file)
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "univnotebook.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -29,18 +25,50 @@
 
 #if wxUSE_NOTEBOOK
 
 
 #if wxUSE_NOTEBOOK
 

-#include "wx/imaglist.h"

 #include "wx/notebook.h"
 #include "wx/notebook.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/dcmemory.h"
+#endif
+
+#include "wx/imaglist.h"

 #include "wx/spinbutt.h"
 #include "wx/spinbutt.h"

-#include "wx/dcmemory.h"

 
 #include "wx/univ/renderer.h"
 
 
 #include "wx/univ/renderer.h"
 

+// ----------------------------------------------------------------------------
+// wxStdNotebookInputHandler: translates SPACE and ENTER keys and the left mouse
+// click into button press/release actions
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxStdNotebookInputHandler : public wxStdInputHandler
+{
+public:
+    wxStdNotebookInputHandler(wxInputHandler *inphand);
+
+    virtual bool HandleKey(wxInputConsumer *consumer,
+                           const wxKeyEvent& event,
+                           bool pressed);
+    virtual bool HandleMouse(wxInputConsumer *consumer,
+                             const wxMouseEvent& event);
+    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);
+    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);
+    virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
+
+protected:
+    void HandleFocusChange(wxInputConsumer *consumer);
+};
+

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 

-#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
+#if 0
+// 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())
+#endif

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -59,7 +87,7 @@ class wxNotebookSpinBtn : public wxSpinButton
 {
 public:
     wxNotebookSpinBtn(wxNotebook *nb)
 {
 public:
     wxNotebookSpinBtn(wxNotebook *nb)

-        : wxSpinButton(nb, -1,
+        : wxSpinButton(nb, wxID_ANY,

                        wxDefaultPosition, wxDefaultSize,
                        nb->IsVertical() ? wxSP_VERTICAL : wxSP_HORIZONTAL)
     {
                        wxDefaultPosition, wxDefaultSize,
                        nb->IsVertical() ? wxSP_VERTICAL : wxSP_HORIZONTAL)
     {


@@ -79,7 +107,7 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxNotebookSpinBtn, wxSpinButton)
 };
 
 BEGIN_EVENT_TABLE(wxNotebookSpinBtn, wxSpinButton)

-    EVT_SPIN(-1, wxNotebookSpinBtn::OnSpin)
+    EVT_SPIN(wxID_ANY, wxNotebookSpinBtn::OnSpin)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -116,33 +144,36 @@ bool wxNotebook::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
                         long style,
                         const wxString& name)
 {

+    if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
+        style |= wxBK_TOP;
+

     if ( !wxControl::Create(parent, id, pos, size, style,
                             wxDefaultValidator, name) )
     if ( !wxControl::Create(parent, id, pos, size, style,
                             wxDefaultValidator, name) )

-        return FALSE;
+        return false;

 
     m_sizePad = GetRenderer()->GetTabPadding();
 
 
     m_sizePad = GetRenderer()->GetTabPadding();
 

-    SetBestSize(size);
+    SetInitialSize(size);

 
     CreateInputHandler(wxINP_HANDLER_NOTEBOOK);
 
 
     CreateInputHandler(wxINP_HANDLER_NOTEBOOK);
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook page titles and images
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook page titles and images
 // ----------------------------------------------------------------------------
 

-wxString wxNotebook::GetPageText(int nPage) const
+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];
 }
 
 
     return m_titles[nPage];
 }
 

-bool wxNotebook::SetPageText(int nPage, const wxString& strText)
+bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)

 {
 {

-    wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), false, _T("invalid notebook page") );

 
     if ( strText != m_titles[nPage] )
     {
 
     if ( strText != m_titles[nPage] )
     {


@@ -160,21 +191,21 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText)
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

-int wxNotebook::GetPageImage(int nPage) const
+int wxNotebook::GetPageImage(size_t nPage) const

 {
 {

-    wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, _T("invalid notebook page") );

 
     return m_images[nPage];
 }
 
 
     return m_images[nPage];
 }
 

-bool wxNotebook::SetPageImage(int nPage, int nImage)
+bool wxNotebook::SetPageImage(size_t nPage, int nImage)

 {
 {

-    wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), false, _T("invalid notebook page") );

 
 

-    wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), FALSE,
+    wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), false,

                  _T("invalid image index in SetPageImage()") );
 
     if ( nImage != m_images[nPage] )
                  _T("invalid image index in SetPageImage()") );
 
     if ( nImage != m_images[nPage] )


@@ -191,7 +222,7 @@ bool wxNotebook::SetPageImage(int nPage, int nImage)
             RefreshTab(nPage);
     }
 
             RefreshTab(nPage);
     }
 

-    return TRUE;
+    return true;

 }
 
 wxNotebook::~wxNotebook()
 }
 
 wxNotebook::~wxNotebook()


@@ -202,9 +233,9 @@ wxNotebook::~wxNotebook()
 // wxNotebook page switching
 // ----------------------------------------------------------------------------
 
 // wxNotebook page switching
 // ----------------------------------------------------------------------------
 

-int wxNotebook::SetSelection(int nPage)
+int wxNotebook::DoSetSelection(size_t nPage, int flags)

 {
 {

-    wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, _T("invalid notebook page") );

 
     if ( (size_t)nPage == m_sel )
     {
 
     if ( (size_t)nPage == m_sel )
     {


@@ -212,6 +243,15 @@ int wxNotebook::SetSelection(int nPage)
         return m_sel;
     }
 
         return m_sel;
     }
 

+    if ( flags & SetSelection_SendEvent )
+    {
+        if ( !SendPageChangingEvent(nPage) )
+        {
+            // program doesn't allow the page change
+            return m_sel;
+        }
+    }
+

     // we need to change m_sel first, before calling RefreshTab() below as
     // otherwise the previously selected tab wouldn't be redrawn properly under
     // wxGTK which calls Refresh() immediately and not during the next event
     // we need to change m_sel first, before calling RefreshTab() below as
     // otherwise the previously selected tab wouldn't be redrawn properly under
     // wxGTK which calls Refresh() immediately and not during the next event


@@ -222,7 +262,7 @@ int wxNotebook::SetSelection(int nPage)
 
     if ( selOld != INVALID_PAGE )
     {
 
     if ( selOld != INVALID_PAGE )
     {

-        RefreshTab(selOld, TRUE /* this tab was selected */);
+        RefreshTab(selOld, true /* this tab was selected */);

 
         m_pages[selOld]->Hide();
     }
 
         m_pages[selOld]->Hide();
     }


@@ -255,47 +295,27 @@ int wxNotebook::SetSelection(int nPage)
         m_pages[m_sel]->Show();
     }
 
         m_pages[m_sel]->Show();
     }
 

-    return m_sel;
-}
-
-void wxNotebook::ChangePage(int nPage)
-{
-    wxCHECK_RET( IS_VALID_PAGE(nPage), _T("invalid notebook page") );
-
-    if ( (size_t)nPage == m_sel )
+    if ( flags & SetSelection_SendEvent )

     {
     {

-        // nothing to do
-        return;
+        // event handling
+        SendPageChangedEvent(selOld);

     }
 
     }
 

-    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
-    event.SetSelection(nPage);
-    event.SetOldSelection(m_sel);
-    event.SetEventObject(this);
-    if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )
-    {
-        // program doesn't allow the page change
-        return;
-    }
-
-    SetSelection(nPage);
-
-    event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
-    GetEventHandler()->ProcessEvent(event);
+    return selOld;

 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook pages adding/deleting
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook pages adding/deleting
 // ----------------------------------------------------------------------------
 

-bool wxNotebook::InsertPage(int nPage,
+bool wxNotebook::InsertPage(size_t nPage,

                             wxNotebookPage *pPage,
                             const wxString& strText,
                             bool bSelect,
                             int imageId)
 {
                             wxNotebookPage *pPage,
                             const wxString& strText,
                             bool bSelect,
                             int imageId)
 {

-    int nPages = GetPageCount();
-    wxCHECK_MSG( nPage == nPages || IS_VALID_PAGE(nPage), FALSE,
+    size_t nPages = GetPageCount();
+    wxCHECK_MSG( nPage == nPages || IS_VALID_PAGE(nPage), false,

                  _T("invalid notebook page in InsertPage()") );
 
     // modify the data
                  _T("invalid notebook page in InsertPage()") );
 
     // modify the data


@@ -327,9 +347,10 @@ bool wxNotebook::InsertPage(int nPage,
     if ( nPages == 0 )
     {
         // always select the first tab to have at least some selection
     if ( nPages == 0 )
     {
         // always select the first tab to have at least some selection

-        bSelect = TRUE;
+        bSelect = true;

 
         Relayout();
 
         Relayout();

+        Refresh();

     }
     else // not the first tab
     {
     }
     else // not the first tab
     {


@@ -345,13 +366,13 @@ bool wxNotebook::InsertPage(int nPage,
         pPage->Hide();
     }
 
         pPage->Hide();
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxNotebook::DeleteAllPages()
 {
     if ( !wxNotebookBase::DeleteAllPages() )
 }
 
 bool wxNotebook::DeleteAllPages()
 {
     if ( !wxNotebookBase::DeleteAllPages() )

-        return FALSE;
+        return false;

 
     // clear the other arrays as well
     m_titles.Clear();
 
     // clear the other arrays as well
     m_titles.Clear();


@@ -367,10 +388,10 @@ bool wxNotebook::DeleteAllPages()
 
     Relayout();
 
 
     Relayout();
 

-    return TRUE;
+    return true;

 }
 
 }
 

-wxNotebookPage *wxNotebook::DoRemovePage(int nPage)
+wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)

 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), NULL, _T("invalid notebook page") );
 
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), NULL, _T("invalid notebook page") );
 


@@ -391,7 +412,7 @@ wxNotebookPage *wxNotebook::DoRemovePage(int nPage)
         UpdateSpinBtn();
     }
 
         UpdateSpinBtn();
     }
 

-    int count = GetPageCount();
+    size_t count = GetPageCount();

     if ( count )
     {
         if ( m_sel == (size_t)nPage )
     if ( count )
     {
         if ( m_sel == (size_t)nPage )


@@ -462,17 +483,19 @@ void wxNotebook::DoDrawTab(wxDC& dc, const wxRect& rect, size_t n)
     {
         int image = m_images[n];
 
     {
         int image = m_images[n];
 

-#ifdef __WXMSW__    // FIXME
+        // Not needed now that wxGenericImageList is being
+        // used for wxUniversal under MSW
+#if 0 // def __WXMSW__    // FIXME

         int w, h;
         m_imageList->GetSize(n, w, h);
         bmp.Create(w, h);
         wxMemoryDC dc;
         dc.SelectObject(bmp);
         dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
         int w, h;
         m_imageList->GetSize(n, w, h);
         bmp.Create(w, h);
         wxMemoryDC dc;
         dc.SelectObject(bmp);
         dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));

-        m_imageList->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, TRUE);
+        m_imageList->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, true);

         dc.SelectObject(wxNullBitmap);
 #else
         dc.SelectObject(wxNullBitmap);
 #else

-        bmp = *m_imageList->GetBitmap(image);
+        bmp = m_imageList->GetBitmap(image);

 #endif
     }
 
 #endif
     }
 


@@ -516,10 +539,20 @@ void wxNotebook::DoDraw(wxControlRenderer *renderer)
         wxSize sizeSpinBtn = m_spinbtn->GetSize();
 
         if ( IsVertical() )
         wxSize sizeSpinBtn = m_spinbtn->GetSize();
 
         if ( IsVertical() )

+        {

             rectTabs.height -= sizeSpinBtn.y;
             rectTabs.height -= sizeSpinBtn.y;

+
+            // Allow for erasing the line under selected tab
+            rectTabs.width += 2;
+        }

         else
         else

+        {

             rectTabs.width -= sizeSpinBtn.x;
 
             rectTabs.width -= sizeSpinBtn.x;
 

+            // Allow for erasing the line under selected tab
+            rectTabs.height += 2;
+        }
+

         dc.SetClippingRegion(rectTabs);
     }
 
         dc.SetClippingRegion(rectTabs);
     }
 


@@ -564,16 +597,21 @@ void wxNotebook::DoDraw(wxControlRenderer *renderer)
     {
         DoDrawTab(dc, rectSel, m_sel);
     }
     {
         DoDrawTab(dc, rectSel, m_sel);
     }

+
+    dc.DestroyClippingRegion();

 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook geometry
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook geometry
 // ----------------------------------------------------------------------------
 

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

 {
 {

+    if ( flags )
+        *flags = wxBK_HITTEST_NOWHERE;
+

     // first check that it is in this window at all
     // first check that it is in this window at all

-    if ( !GetClientRect().Inside(pt) )
+    if ( !GetClientRect().Contains(pt) )

     {
         return -1;
     }
     {
         return -1;
     }


@@ -611,8 +649,16 @@ int wxNotebook::HitTest(const wxPoint& pt) const
     {
         GetTabSize(n, &rectTabs.width, &rectTabs.height);
 
     {
         GetTabSize(n, &rectTabs.width, &rectTabs.height);
 

-        if ( rectTabs.Inside(pt) )
+        if ( rectTabs.Contains(pt) )
+        {
+            if ( flags )
+            {
+                // TODO: be more precise
+                *flags = wxBK_HITTEST_ONITEM;
+            }
+

             return n;
             return n;

+        }

 
         // move the rectTabs to the next tab
         if ( IsVertical() )
 
         // move the rectTabs to the next tab
         if ( IsVertical() )


@@ -634,14 +680,14 @@ bool wxNotebook::IsVertical() const
 wxDirection wxNotebook::GetTabOrientation() const
 {
     long style = GetWindowStyle();
 wxDirection wxNotebook::GetTabOrientation() const
 {
     long style = GetWindowStyle();

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

         return wxBOTTOM;
         return wxBOTTOM;

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

         return wxRIGHT;
         return wxRIGHT;

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

         return wxLEFT;
 
         return wxLEFT;
 

-    // wxNB_TOP == 0 so we don't have to test for it
+    // wxBK_TOP == 0 so we don't have to test for it

     return wxTOP;
 }
 
     return wxTOP;
 }
 


@@ -721,8 +767,16 @@ wxRect wxNotebook::GetTabsPart() const
     const wxSize indent = GetRenderer()->GetTabIndent();
     if ( IsVertical() )
     {
     const wxSize indent = GetRenderer()->GetTabIndent();
     if ( IsVertical() )
     {

-        rect.x += indent.y;

         rect.y += indent.x;
         rect.y += indent.x;

+        if ( dir == wxLEFT )
+        {
+            rect.x += indent.y;
+            rect.width -= indent.y;
+        }
+        else // wxRIGHT
+        {
+            rect.width -= indent.y;
+        }

     }
     else // horz
     {
     }
     else // horz
     {


@@ -809,7 +863,7 @@ void wxNotebook::ResizeTab(int page)
     wxSize sizeTab = CalcTabSize(page);
 
     // we only need full relayout if the page size changes
     wxSize sizeTab = CalcTabSize(page);
 
     // we only need full relayout if the page size changes

-    bool needsRelayout = FALSE;
+    bool needsRelayout = false;

 
     if ( IsVertical() )
     {
 
     if ( IsVertical() )
     {


@@ -821,7 +875,7 @@ void wxNotebook::ResizeTab(int page)
 
     if ( sizeTab.y > m_heightTab )
     {
 
     if ( sizeTab.y > m_heightTab )
     {

-        needsRelayout = TRUE;
+        needsRelayout = true;

 
         m_heightTab = sizeTab.y;
     }
 
         m_heightTab = sizeTab.y;
     }


@@ -947,7 +1001,7 @@ void wxNotebook::SetPageSize(const wxSize& size)
     SetClientSize(GetSizeForPage(size));
 }
 
     SetClientSize(GetSizeForPage(size));
 }
 

-wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage)
+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const

 {
     return AdjustSize(GetSizeForPage(sizePage));
 }
 {
     return AdjustSize(GetSizeForPage(sizePage));
 }


@@ -1047,7 +1101,7 @@ void wxNotebook::UpdateSpinBtn()
     {
         // this case is special, get rid of it immediately: everything is
         // visible and we don't need any spin buttons
     {
         // this case is special, get rid of it immediately: everything is
         // visible and we don't need any spin buttons

-        allTabsShown = TRUE;
+        allTabsShown = true;

 
         // have to reset them manually as we don't call CalcLastVisibleTab()
         m_firstVisible =
 
         // have to reset them manually as we don't call CalcLastVisibleTab()
         m_firstVisible =


@@ -1103,7 +1157,7 @@ void wxNotebook::UpdateSpinBtn()
     }
     else // all tabs are visible, we don't need spin button
     {
     }
     else // all tabs are visible, we don't need spin button
     {

-        if ( m_spinbtn )
+        if ( m_spinbtn && m_spinbtn -> IsShown() )

         {
             m_spinbtn->Hide();
         }
         {
             m_spinbtn->Hide();
         }


@@ -1221,7 +1275,7 @@ void wxNotebook::ScrollLastTo(int page)
 wxSize wxNotebook::DoGetBestClientSize() const
 {
     // calculate the max page size
 wxSize wxNotebook::DoGetBestClientSize() const
 {
     // calculate the max page size

-    wxSize size(0, 0);
+    wxSize size;

 
     size_t count = GetPageCount();
     if ( count )
 
     size_t count = GetPageCount();
     if ( count )


@@ -1261,9 +1315,9 @@ void wxNotebook::DoSetSize(int x, int y,
     wxSize old_client_size = GetClientSize();
 
     wxControl::DoSetSize(x, y, width, height, sizeFlags);
     wxSize old_client_size = GetClientSize();
 
     wxControl::DoSetSize(x, y, width, height, sizeFlags);

-    
+

     wxSize new_client_size = GetClientSize();
     wxSize new_client_size = GetClientSize();

-    
+

     if (old_client_size != new_client_size)
         Relayout();
 }
     if (old_client_size != new_client_size)
         Relayout();
 }


@@ -1277,15 +1331,23 @@ bool wxNotebook::PerformAction(const wxControlAction& action,
                                const wxString& strArg)
 {
     if ( action == wxACTION_NOTEBOOK_NEXT )
                                const wxString& strArg)
 {
     if ( action == wxACTION_NOTEBOOK_NEXT )

-        ChangePage(GetNextPage(TRUE));
+        SetSelection(GetNextPage(true));

     else if ( action == wxACTION_NOTEBOOK_PREV )
     else if ( action == wxACTION_NOTEBOOK_PREV )

-        ChangePage(GetNextPage(FALSE));
+        SetSelection(GetNextPage(false));

     else if ( action == wxACTION_NOTEBOOK_GOTO )
     else if ( action == wxACTION_NOTEBOOK_GOTO )

-        ChangePage((int)numArg);
+        SetSelection((int)numArg);

     else
         return wxControl::PerformAction(action, numArg, strArg);
 
     else
         return wxControl::PerformAction(action, numArg, strArg);
 

-    return TRUE;
+    return true;
+}
+
+/* static */
+wxInputHandler *wxNotebook::GetStdInputHandler(wxInputHandler *handlerDef)
+{
+    static wxStdNotebookInputHandler s_handler(handlerDef);
+
+    return &s_handler;

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


@@ -1341,7 +1403,7 @@ bool wxStdNotebookInputHandler::HandleKey(wxInputConsumer *consumer,
                 break;
         }
 
                 break;
         }
 

-        if ( !!action )
+        if ( !action.IsEmpty() )

         {
             return consumer->PerformAction(action, page);
         }
         {
             return consumer->PerformAction(action, page);
         }


@@ -1361,7 +1423,7 @@ bool wxStdNotebookInputHandler::HandleMouse(wxInputConsumer *consumer,
         {
             consumer->PerformAction(wxACTION_NOTEBOOK_GOTO, page);
 
         {
             consumer->PerformAction(wxACTION_NOTEBOOK_GOTO, page);
 

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 


@@ -1374,12 +1436,13 @@ bool wxStdNotebookInputHandler::HandleMouseMove(wxInputConsumer *consumer,
     return wxStdInputHandler::HandleMouseMove(consumer, event);
 }
 
     return wxStdInputHandler::HandleMouseMove(consumer, event);
 }
 

-bool wxStdNotebookInputHandler::HandleFocus(wxInputConsumer *consumer,
-                                            const wxFocusEvent& event)
+bool
+wxStdNotebookInputHandler::HandleFocus(wxInputConsumer *consumer,
+                                       const wxFocusEvent& WXUNUSED(event))

 {
     HandleFocusChange(consumer);
 
 {
     HandleFocusChange(consumer);
 

-    return FALSE;
+    return false;

 }
 
 bool wxStdNotebookInputHandler::HandleActivation(wxInputConsumer *consumer,
 }
 
 bool wxStdNotebookInputHandler::HandleActivation(wxInputConsumer *consumer,


@@ -1388,7 +1451,7 @@ bool wxStdNotebookInputHandler::HandleActivation(wxInputConsumer *consumer,
     // we react to the focus change in the same way as to the [de]activation
     HandleFocusChange(consumer);
 
     // we react to the focus change in the same way as to the [de]activation
     HandleFocusChange(consumer);
 

-    return FALSE;
+    return false;

 }
 
 void wxStdNotebookInputHandler::HandleFocusChange(wxInputConsumer *consumer)
 }
 
 void wxStdNotebookInputHandler::HandleFocusChange(wxInputConsumer *consumer)


@@ -1398,4 +1461,3 @@ void wxStdNotebookInputHandler::HandleFocusChange(wxInputConsumer *consumer)
 }
 
 #endif // wxUSE_NOTEBOOK
 }
 
 #endif // wxUSE_NOTEBOOK

-