///////////////////////////////////////////////////////////////////////////////
-// Name: notebook.cpp
+// Name: src/mac/carbon/notebmac.cpp
// Purpose: implementation of wxNotebook
// Author: Stefan Csomor
// Modified by:
DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
BEGIN_EVENT_TABLE(wxNotebook, wxControl)
- EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
+ EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)
EVT_SIZE(wxNotebook::OnSize)
EVT_SET_FOCUS(wxNotebook::OnSetFocus)
long style,
const wxString& name)
{
- m_macIsUserPane = FALSE ;
-
+ m_macIsUserPane = false ;
+
if ( !wxNotebookBase::Create(parent, id, pos, size, style, name) )
return false;
bounds.bottom = bounds.top + 100 ;
UInt16 tabstyle = kControlTabDirectionNorth ;
- if ( HasFlag(wxNB_LEFT) )
+ if ( HasFlag(wxBK_LEFT) )
tabstyle = kControlTabDirectionWest ;
- else if ( HasFlag( wxNB_RIGHT ) )
+ else if ( HasFlag( wxBK_RIGHT ) )
tabstyle = kControlTabDirectionEast ;
- else if ( HasFlag( wxNB_BOTTOM ) )
+ else if ( HasFlag( wxBK_BOTTOM ) )
tabstyle = kControlTabDirectionSouth ;
-
+
ControlTabSize tabsize = kControlTabSizeLarge ;
if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
tabsize = kControlTabSizeSmall ;
else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
{
if (UMAGetSystemVersion() >= 0x1030 )
- tabsize = 3 ;
+ tabsize = 3 ;
else
- tabsize = kControlSizeSmall;
+ tabsize = kControlSizeSmall;
}
m_peer = new wxMacControl(this) ;
verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
- tabsize , tabstyle, 0, NULL, m_peer->GetControlRefAddr() ) );
-
-
+ tabsize , tabstyle, 0, NULL, m_peer->GetControlRefAddr() ) );
+
+
MacPostControlCreate(pos,size) ;
- return TRUE ;
+ return true ;
}
// dtor
int wxNotebook::SetSelection(size_t nPage)
{
- 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") );
if ( int(nPage) != m_nSelection )
{
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];
}
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] )
MacSetupTabs() ;
}
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
MacSetupTabs();
m_nSelection = -1 ;
InvalidateBestSize();
- return TRUE;
+ 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_nSelection )
{
m_nSelection++;
// while this still is the same page showing, we need to update the tabs
m_peer->SetValue( m_nSelection + 1 ) ;
}
-
+
// some page should be selected: either this one or the first one if there
// is still no selection
int selNew = -1;
return true;
}
+int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
+{
+ int resultV = wxNOT_FOUND;
+#if TARGET_API_MAC_OSX
+ const int countPages = GetPageCount();
+
+ HIPoint hipoint= { pt.x , pt.y } ;
+ HIViewPartCode outPart = 0 ;
+ OSStatus err = HIViewGetPartHit (
+ m_peer->GetControlRef() ,
+ &hipoint ,
+ &outPart
+ );
+
+ int max = m_peer->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 maxval = max ;
+ if ( max == 1 )
+ {
+ m_peer->SetMaximum( 2 ) ;
+ maxval = 2 ;
+ }
+
+ if ( val == 1 )
+ m_peer->SetValue( maxval ) ;
+ else
+ m_peer->SetValue( 1 ) ;
+
+ err = HIViewGetPartHit (
+ m_peer->GetControlRef() ,
+ &hipoint ,
+ &outPart
+ );
+
+ m_peer->SetValue( val ) ;
+ if ( max == 1 )
+ {
+ m_peer->SetMaximum( 1 ) ;
+ }
+ }
+
+ if ( outPart >= 1 && outPart <= countPages )
+ {
+ resultV = outPart ;
+ }
+#endif // TARGET_API_MAC_OSX
+
+ if (flags != NULL)
+ {
+ *flags = 0;
+
+ // we cannot differentiate better
+ if (resultV >= 1)
+ *flags |= wxNB_HITTEST_ONLABEL;
+ else
+ *flags |= wxNB_HITTEST_NOWHERE;
+ }
+ return resultV;
+}
+
/* Added by Mark Newsam
* When a page is added or deleted to the notebook this function updates
* information held in the control so that it matches the order
void wxNotebook::SetConstraintSizes(bool WXUNUSED(recurse))
{
- // don't set the sizes of the pages - their correct size is not yet known
- wxControl::SetConstraintSizes(FALSE);
+ // don't set the sizes of the pages - their correct size is not yet known
+ wxControl::SetConstraintSizes(false);
}
bool wxNotebook::DoPhase(int WXUNUSED(nPhase))
{
- return TRUE;
+ return true;
}
#endif // wxUSE_CONSTRAINTS
// hide the currently active panel and show the new one
void wxNotebook::ChangePage(int nOldSel, int nSel)
{
- if ( nOldSel != -1 )
+ if ( nOldSel != -1 )
{
- m_pages[nOldSel]->Show(FALSE);
+ m_pages[nOldSel]->Show(false);
}
if ( nSel != -1 )
{
wxNotebookPage *pPage = m_pages[nSel];
- pPage->Show(TRUE);
+ pPage->Show(true);
pPage->SetFocus();
}
-
+
m_nSelection = nSel;
m_peer->SetValue( m_nSelection + 1 ) ;
}
-wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
{
OSStatus status = eventNotHandledErr ;
-
+
SInt32 newSel = m_peer->GetValue() - 1 ;
if ( newSel != m_nSelection )
{
}
#endif
-
projects / wxWidgets.git / blobdiff