EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxBookCtrlBase)
-
-
-// common part of all ctors
-void wxNotebook::Init()
-{
- m_nSelection = -1;
-}
-
-// default for dynamic class
-wxNotebook::wxNotebook()
-{
- Init();
-}
-
-// the same arguments as for wxControl
-wxNotebook::wxNotebook( wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name )
-{
- Init();
-
- Create( parent, id, pos, size, style, name );
-}
-
bool wxNotebook::Create( wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
const wxString& name )
-{
- m_macIsUserPane = false ;
-
+{
+ DontCreatePeer();
+
if (! (style & wxBK_ALIGN_MASK))
style |= wxBK_TOP;
if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) )
return false;
- m_peer = wxWidgetImpl::CreateTabView(this,parent, id, pos, size, style, GetExtraStyle() );
+ SetPeer(wxWidgetImpl::CreateTabView(this,parent, id, pos, size, style, GetExtraStyle() ));
MacPostControlCreate( pos, size );
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("DoSetSelection: invalid notebook page") );
- if ( m_nSelection == wxNOT_FOUND || nPage != (size_t)m_nSelection )
+ if ( m_selection == wxNOT_FOUND || nPage != (size_t)m_selection )
{
if ( flags & SetSelection_SendEvent )
{
if ( !SendPageChangingEvent(nPage) )
{
// vetoed by program
- return m_nSelection;
+ return m_selection;
}
//else: program allows the page change
- SendPageChangedEvent(m_nSelection, nPage);
+ SendPageChangedEvent(m_selection, nPage);
}
- ChangePage(m_nSelection, nPage);
+ ChangePage(m_selection, nPage);
}
//else: no change
- return m_nSelection;
+ return m_selection;
}
bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
{
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] )
MacSetupTabs();
- if (m_nSelection >= (int)GetPageCount())
- m_nSelection = GetPageCount() - 1;
+ if (m_selection >= (int)GetPageCount())
+ m_selection = GetPageCount() - 1;
- if (m_nSelection >= 0)
- m_pages[m_nSelection]->Show(true);
+ if (m_selection >= 0)
+ m_pages[m_selection]->Show(true);
InvalidateBestSize();
{
WX_CLEAR_ARRAY(m_pages) ;
MacSetupTabs();
- m_nSelection = -1 ;
+ m_selection = wxNOT_FOUND ;
InvalidateBestSize();
return true;
// if the inserted page is before the selected one, we must update the
// index of the selected page
- if ( int(nPage) <= m_nSelection )
+ if ( int(nPage) <= m_selection )
{
- m_nSelection++;
+ m_selection++;
// while this still is the same page showing, we need to update the tabs
- m_peer->SetValue( m_nSelection + 1 ) ;
+ GetPeer()->SetValue( m_selection + 1 ) ;
}
- // some page should be selected: either this one or the first one if there
- // is still no selection
- int selNew = wxNOT_FOUND;
- if ( bSelect )
- selNew = nPage;
- else if ( m_nSelection == -1 )
- selNew = 0;
-
- if ( selNew != wxNOT_FOUND )
- SetSelection( selNew );
+ DoSetSelectionAfterInsertion(nPage, bSelect);
InvalidateBestSize();
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
HIPoint hipoint= { adjustedPt.x , adjustedPt.y } ;
HIViewPartCode outPart = 0 ;
- OSStatus err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart );
+ OSStatus err = HIViewGetPartHit( GetPeer()->GetControlRef(), &hipoint, &outPart );
- int max = m_peer->GetMaximum() ;
+ int max = GetPeer()->GetMaximum() ;
if ( outPart == 0 && max > 0 )
{
// this is a hack, as unfortunately a hit on an already selected tab returns 0,
// so we have to go some extra miles to make sure we select something different
// and try again ..
- int val = m_peer->GetValue() ;
+ int val = GetPeer()->GetValue() ;
int maxval = max ;
if ( max == 1 )
{
- m_peer->SetMaximum( 2 ) ;
+ GetPeer()->SetMaximum( 2 ) ;
maxval = 2 ;
}
if ( val == 1 )
- m_peer->SetValue( maxval ) ;
+ GetPeer()->SetValue( maxval ) ;
else
- m_peer->SetValue( 1 ) ;
+ GetPeer()->SetValue( 1 ) ;
- err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart );
+ err = HIViewGetPartHit( GetPeer()->GetControlRef(), &hipoint, &outPart );
- m_peer->SetValue( val ) ;
+ GetPeer()->SetValue( val ) ;
if ( max == 1 )
- m_peer->SetMaximum( 1 ) ;
+ GetPeer()->SetMaximum( 1 ) ;
}
if ( outPart >= 1 && outPart <= countPages )
else
*flags |= wxBK_HITTEST_NOWHERE;
}
+#else
+ wxUnusedVar(pt);
+ wxUnusedVar(flags);
#endif
return resultV;
}
//
void wxNotebook::MacSetupTabs()
{
- m_peer->SetupTabs(*this);
+ GetPeer()->SetupTabs(*this);
Refresh();
}
pPage->SetSize(rect, wxSIZE_FORCE_EVENT);
}
+#if 0 // deactivate r65078 for the moment
// If the selected page is hidden at this point, the notebook
// has become visible for the first time after creation, and
// we postponed showing the page in ChangePage().
// So show the selected page now.
- if ( m_nSelection != -1 )
+ if ( m_selection != wxNOT_FOUND )
{
- wxNotebookPage *pPage = m_pages[m_nSelection];
+ wxNotebookPage *pPage = m_pages[m_selection];
if ( !pPage->IsShown() )
{
pPage->Show( true );
pPage->SetFocus();
}
}
+#endif
// Processing continues to next OnSize
event.Skip();
void wxNotebook::OnSetFocus(wxFocusEvent& event)
{
// set focus to the currently selected page if any
- if ( m_nSelection != -1 )
- m_pages[m_nSelection]->SetFocus();
+ if ( m_selection != wxNOT_FOUND )
+ m_pages[m_selection]->SetFocus();
event.Skip();
}
if ( ((wxWindow*)event.GetEventObject()) == parent )
{
// no, it doesn't come from child, case (b): forward to a page
- if ( m_nSelection != -1 )
+ if ( m_selection != wxNOT_FOUND )
{
// so that the page knows that the event comes from it's parent
// and is being propagated downwards
event.SetEventObject( this );
- wxWindow *page = m_pages[m_nSelection];
+ wxWindow *page = m_pages[m_selection];
if ( !page->HandleWindowEvent( event ) )
{
page->SetFocus();
if ( nSel != wxNOT_FOUND )
{
wxNotebookPage *pPage = m_pages[nSel];
+#if 0 // deactivate r65078 for the moment
if ( IsShownOnScreen() )
{
pPage->Show( true );
// We Show() the selected page in our OnSize handler,
// unless it already is shown.
}
+#else
+ pPage->Show( true );
+ pPage->SetFocus();
+#endif
}
- m_nSelection = nSel;
- m_peer->SetValue( m_nSelection + 1 ) ;
+ m_selection = nSel;
+ GetPeer()->SetValue( m_selection + 1 ) ;
}
bool wxNotebook::OSXHandleClicked( double WXUNUSED(timestampsec) )
{
bool status = false ;
- SInt32 newSel = m_peer->GetValue() - 1 ;
- if ( newSel != m_nSelection )
+ SInt32 newSel = GetPeer()->GetValue() - 1 ;
+ if ( newSel != m_selection )
{
wxBookCtrlEvent changing(
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
- newSel , m_nSelection );
+ newSel , m_selection );
changing.SetEventObject( this );
HandleWindowEvent( changing );
{
wxBookCtrlEvent event(
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId,
- newSel, m_nSelection );
+ newSel, m_selection );
event.SetEventObject( this );
HandleWindowEvent( event );
+
+ m_selection = newSel;
}
else
{
- m_peer->SetValue( m_nSelection + 1 ) ;
+ GetPeer()->SetValue( m_selection + 1 ) ;
}
status = true ;
projects / wxWidgets.git / blobdiff