fixes #14318

[wxWidgets.git] / src / osx / notebook_osx.cpp

diff --git a/src/osx/notebook_osx.cpp b/src/osx/notebook_osx.cpp
index f18f86dacf8df845400a925e89bce0eb076863af..94d609af4e0bcc64f7dd06a7128d9a57b28e4922 100644 (file)
--- a/src/osx/notebook_osx.cpp
+++ b/src/osx/notebook_osx.cpp
@@ -44,9 +44,9 @@ bool wxNotebook::Create( wxWindow *parent,
     const wxSize& size,
     long style,
     const wxString& name )
-{
-    m_macIsUserPane = false ;
-
+{    
+    DontCreatePeer();
+    
     if (! (style & wxBK_ALIGN_MASK))
         style |= wxBK_TOP;
 
@@ -145,7 +145,7 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), false,
         wxT("SetPageImage: invalid notebook page") );
-    wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), false,
+    wxCHECK_MSG( HasImageList() && nImage < GetImageList()->GetImageCount(), false,
         wxT("SetPageImage: invalid image index") );
 
     if ( nImage != m_images[nPage] )
@@ -245,10 +245,10 @@ bool wxNotebook::InsertPage(size_t nPage,
     return true;
 }
 
-int wxNotebook::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(flags)) const
+int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
 {
     int resultV = wxNOT_FOUND;
-#if 0
+#ifdef __WXOSX_CARBON__
     const int countPages = GetPageCount();
 
     // we have to convert from Client to Window relative coordinates
@@ -300,6 +300,9 @@ int wxNotebook::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(flags)) con
         else
             *flags |= wxBK_HITTEST_NOWHERE;
     }
+#else
+    wxUnusedVar(pt);
+    wxUnusedVar(flags);
 #endif
     return resultV;
 }
@@ -517,6 +520,8 @@ bool wxNotebook::OSXHandleClicked( double WXUNUSED(timestampsec) )
                 newSel, m_selection );
             event.SetEventObject( this );
             HandleWindowEvent( event );
+
+            m_selection = newSel;
         }
         else
         {