BEGIN_EVENT_TABLE(wxNotebook, wxControl)
EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
- EVT_MOUSE_EVENTS(wxNotebook::OnMouse)
EVT_SIZE(wxNotebook::OnSize)
EVT_SET_FOCUS(wxNotebook::OnSetFocus)
// implementation
// ============================================================================
-// The Appearance Manager docs show using tab controls in either edge to edge
-// mode, or inset. I think edge to edge conforms better to the other ports,
-// and inset mode is better accomplished with space around the wxNotebook rather
-// than within it. --Robin
-#define wxMAC_EDGE_TO_EDGE 1
-
-static inline int wxMacTabMargin(long nbStyle, long side)
-{
- static int tabMargin = -1;
- static int otherMargin = -1;
-
- if ( tabMargin == -1)
- {
- if ( UMAHasAquaLayout() )
- {
- tabMargin = 26; // From Appearance Manager docs for small tab control dimensions
-#if wxMAC_EDGE_TO_EDGE
- otherMargin = 0;
-#else
- otherMargin = 20;
-#endif
- }
- else
- {
- tabMargin = 30;
-#if wxMAC_EDGE_TO_EDGE
- otherMargin = 0;
-#else
- otherMargin = 16;
-#endif
- }
- }
-
- // If the style matches the side asked for then return the tab margin,
- // but we have to special case wxNB_TOP since it is zero...
- if ( side == wxNB_TOP)
- {
- if ( nbStyle != 0 && nbStyle & (wxNB_LEFT|wxNB_RIGHT|wxNB_BOTTOM))
- {
- return otherMargin;
- }
- else
- {
- return tabMargin;
- }
- }
- else if ( nbStyle & side)
- return tabMargin;
- else
- return otherMargin;
-}
-
-static inline int wxMacTabLeftMargin(long style)
-{
- return wxMacTabMargin(style, wxNB_LEFT);
-}
-
-static inline int wxMacTabTopMargin(long style)
-{
- return wxMacTabMargin(style, wxNB_TOP);
-}
-
-static inline int wxMacTabRightMargin(long style)
-{
- return wxMacTabMargin(style, wxNB_RIGHT);
-}
-
-static inline int wxMacTabBottomMargin(long style)
-{
- return wxMacTabMargin(style, wxNB_BOTTOM);
-}
-
// ----------------------------------------------------------------------------
// wxNotebook construction
// ----------------------------------------------------------------------------
// common part of all ctors
void wxNotebook::Init()
{
- if ( UMAHasAquaLayout() )
- {
- // Should these depend on wxMAC_EDGE_TO_EDGE too?
- m_macHorizontalBorder = 7;
- m_macVerticalBorder = 8;
- }
-
m_nSelection = -1;
}
long style,
const wxString& name)
{
+ m_macIsUserPane = FALSE ;
+
if ( !wxNotebookBase::Create(parent, id, pos, size, style, name) )
return false;
- Rect bounds ;
- Str255 title ;
+ Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
- MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
+ if( bounds.right <= bounds.left )
+ bounds.right = bounds.left + 100 ;
+ if ( bounds.bottom <= bounds.top )
+ bounds.bottom = bounds.top + 100 ;
- int tabstyle = kControlTabSmallNorthProc ;
+ UInt16 tabstyle = kControlTabDirectionNorth ;
if ( HasFlag(wxNB_LEFT) )
- tabstyle = kControlTabSmallWestProc ;
+ tabstyle = kControlTabDirectionWest ;
else if ( HasFlag( wxNB_RIGHT ) )
- tabstyle = kControlTabSmallEastProc ;
+ tabstyle = kControlTabDirectionEast ;
else if ( HasFlag( wxNB_BOTTOM ) )
- tabstyle = kControlTabSmallSouthProc ;
-
-
- m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1,
- tabstyle , (long) this ) ;
+ tabstyle = kControlTabDirectionSouth ;
+
+ ControlTabSize tabsize = kControlTabSizeLarge ;
+ if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
+ tabsize = kControlTabSizeSmall ;
+ else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+ {
+ if (UMAGetSystemVersion() >= 0x1030 )
+ tabsize = 3 ;
+ else
+ tabsize = kControlSizeSmall;
+ }
- MacPostControlCreate() ;
+ m_peer = new wxMacControl() ;
+ verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
+ tabsize , tabstyle, 0, NULL, m_peer->GetControlRefAddr() ) );
+
+
+ MacPostControlCreate(pos,size) ;
return TRUE ;
}
{
}
-wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
-{
- wxSize sizeTotal = sizePage;
-
- int major,minor;
- wxGetOsVersion( &major, &minor );
-
- // Mac has large notebook borders. Aqua even more so.
-
- if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
- {
- sizeTotal.x += 90;
-
- if (major >= 10)
- sizeTotal.y += 28;
- else
- sizeTotal.y += 20;
- }
- else
- {
- if (major >= 10)
- {
- sizeTotal.x += 34;
- sizeTotal.y += 46;
- }
- else
- {
- sizeTotal.x += 22;
- sizeTotal.y += 44;
- }
- }
-
- return sizeTotal;
-}
-
// ----------------------------------------------------------------------------
// wxNotebook accessors
// ----------------------------------------------------------------------------
void wxNotebook::SetPadding(const wxSize& padding)
{
- wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") );
+ // unsupported by OS
}
void wxNotebook::SetTabSize(const wxSize& sz)
{
- wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") );
+ // unsupported by OS
}
void wxNotebook::SetPageSize(const wxSize& size)
{
- wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") );
+ SetSize( CalcSizeFromPage( size ) );
+}
+
+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
+{
+ return DoGetSizeFromClientSize( sizePage ) ;
}
int wxNotebook::SetSelection(size_t nPage)
if(m_nSelection >= 0) {
m_pages[m_nSelection]->Show(true);
}
+ InvalidateBestSize();
return page;
}
WX_CLEAR_ARRAY(m_pages) ;
MacSetupTabs();
m_nSelection = -1 ;
+ InvalidateBestSize();
return TRUE;
}
MacSetupTabs();
- int h, w;
- GetSize(&w, &h);
- pPage->SetSize(wxMacTabLeftMargin(GetWindowStyle()) + m_macHorizontalBorder,
- wxMacTabTopMargin(GetWindowStyle()) + m_macVerticalBorder,
- w - wxMacTabLeftMargin(GetWindowStyle()) - wxMacTabRightMargin(GetWindowStyle()) - 2*m_macHorizontalBorder,
- h - wxMacTabTopMargin(GetWindowStyle()) - wxMacTabBottomMargin(GetWindowStyle()) - 2*m_macVerticalBorder);
+ wxRect rect = GetPageRect() ;
+ pPage->SetSize(rect);
if ( pPage->GetAutoLayout() ) {
pPage->Layout();
}
{
m_nSelection++;
// while this still is the same page showing, we need to update the tabs
- SetControl32BitValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ;
+ m_peer->SetValue( m_nSelection + 1 ) ;
}
// some page should be selected: either this one or the first one if there
if ( selNew != -1 )
SetSelection(selNew);
+ InvalidateBestSize();
return true;
}
/* Added by Mark Newsam
* When a page is added or deleted to the notebook this function updates
-* information held in the m_macControl so that it matches the order
+* information held in the control so that it matches the order
* the user would expect.
*/
void wxNotebook::MacSetupTabs()
{
- SetControl32BitMaximum( (ControlHandle) m_macControl , GetPageCount() ) ;
+ m_peer->SetMaximum( GetPageCount() ) ;
wxNotebookPage *page;
ControlTabInfoRec info;
info.version = 0;
info.iconSuiteID = 0;
wxMacStringToPascal( page->GetLabel() , info.name ) ;
-
- SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag,
- sizeof( ControlTabInfoRec) , (char*) &info ) ;
- SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ;
+ m_peer->SetData<ControlTabInfoRec>( ii+1, kControlTabInfoTag, &info ) ;
+ m_peer->SetTabEnabled( ii + 1 , true ) ;
#if TARGET_CARBON
if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
{
OSErr err = SetIconFamilyData( iconFamily, 'PICT' , (Handle) info.u.picture ) ;
wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
IconRef iconRef ;
- err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1 , iconFamily, &iconRef ) ;
+ err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1, iconFamily, &iconRef ) ;
wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
info.contentType = kControlContentIconRef ;
info.u.iconRef = iconRef ;
- SetControlData( (ControlHandle) m_macControl, ii+1,kControlTabImageContentTag,
- sizeof( info ), (Ptr)&info );
+ m_peer->SetData<ControlButtonContentInfo>( ii+1,kControlTabImageContentTag, &info );
wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
- UnregisterIconRef( 'WXNG' , (OSType) 1 ) ;
+ if ( UMAGetSystemVersion() < 0x1030 )
+ {
+ UnregisterIconRef( 'WXNG' , (OSType) 1 ) ;
+ }
+
ReleaseIconRef( iconRef ) ;
DisposeHandle( (Handle) iconFamily ) ;
}
#endif
}
Rect bounds;
- GetControlBounds((ControlHandle)m_macControl, &bounds);
- InvalWindowRect((WindowRef)MacGetRootWindow(), &bounds);
+ m_peer->GetRectInWindowCoords( &bounds ) ;
+ InvalWindowRect((WindowRef)MacGetTopLevelWindowRef(), &bounds);
}
+wxRect wxNotebook::GetPageRect() const
+{
+ wxSize size = GetClientSize() ;
+ return wxRect( 0 , 0 , size.x , size.y ) ;
+}
// ----------------------------------------------------------------------------
// wxNotebook callbacks
// ----------------------------------------------------------------------------
// time because doing it in ::Create() doesn't work (for unknown reasons)
void wxNotebook::OnSize(wxSizeEvent& event)
{
- // emulate page change (it's esp. important to do it first time because
- // otherwise our page would stay invisible)
- /*
- int nSel = m_nSelection;
- m_nSelection = -1;
- SetSelection(nSel);
- */
-
- // fit the notebook page to the tab control's display area
- int w, h;
- GetSize(&w, &h);
unsigned int nCount = m_pages.Count();
+ wxRect rect = GetPageRect() ;
for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {
wxNotebookPage *pPage = m_pages[nPage];
- pPage->SetSize(wxMacTabLeftMargin(GetWindowStyle()) + m_macHorizontalBorder,
- wxMacTabTopMargin(GetWindowStyle()) + m_macVerticalBorder,
- w - wxMacTabLeftMargin(GetWindowStyle()) - wxMacTabRightMargin(GetWindowStyle()) - 2*m_macHorizontalBorder,
- h - wxMacTabTopMargin(GetWindowStyle()) - wxMacTabBottomMargin(GetWindowStyle()) - 2*m_macVerticalBorder);
+ pPage->SetSize(rect);
if ( pPage->GetAutoLayout() ) {
pPage->Layout();
}
}
m_nSelection = nSel;
- SetControl32BitValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ;
+ m_peer->SetValue( m_nSelection + 1 ) ;
}
-
-void wxNotebook::OnMouse( wxMouseEvent &event )
+wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
{
- if ( (ControlHandle) m_macControl == NULL )
- {
- event.Skip() ;
- return ;
- }
-
- if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
+ OSStatus status = eventNotHandledErr ;
+
+ SInt32 newSel = m_peer->GetValue() - 1 ;
+ if ( newSel != m_nSelection )
{
- int x = event.m_x ;
- int y = event.m_y ;
-
- MacClientToRootWindow( &x , &y ) ;
-
- ControlHandle control ;
- Point localwhere ;
- SInt16 controlpart ;
-
- localwhere.h = x ;
- localwhere.v = y ;
-
- short modifiers = 0;
-
- if ( !event.m_leftDown && !event.m_rightDown )
- modifiers |= btnState ;
-
- if ( event.m_shiftDown )
- modifiers |= shiftKey ;
+ wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
+ newSel , m_nSelection);
+ changing.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(changing);
- if ( event.m_controlDown )
- modifiers |= controlKey ;
-
- if ( event.m_altDown )
- modifiers |= optionKey ;
-
- if ( event.m_metaDown )
- modifiers |= cmdKey ;
-
- control = (ControlHandle) m_macControl ;
- if ( control && ::IsControlActive( control ) )
+ if(changing.IsAllowed())
{
- {
- wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
- ::GetControl32BitValue(control) - 1, m_nSelection);
- changing.SetEventObject(this);
- GetEventHandler()->ProcessEvent(changing);
-
- if(changing.IsAllowed())
- {
- controlpart = ::HandleControlClick(control, localwhere, modifiers,
- (ControlActionUPP) -1);
- wxTheApp->s_lastMouseDown = 0 ;
+ wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId,
+ newSel, m_nSelection);
+ event.SetEventObject(this);
- wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId,
- ::GetControl32BitValue(control) - 1, m_nSelection);
- event.SetEventObject(this);
-
- GetEventHandler()->ProcessEvent(event);
- }
- }
+ GetEventHandler()->ProcessEvent(event);
+ }
+ else
+ {
+ m_peer->SetValue( m_nSelection + 1 ) ;
}
+ status = noErr ;
}
-}
-
-
-void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) )
-{
-#if 0
- wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControl32BitValue((ControlHandle)m_macControl) - 1, m_nSelection);
- event.SetEventObject(this);
-
- ProcessEvent(event);
-#endif
+ return status ;
}
projects / wxWidgets.git / blobdiff