GetIcon() returns wxIconLocation, not wxIcon, now

[wxWidgets.git] / src / mac / carbon / notebmac.cpp

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 88a922f99314f147acb0cd42f0a51f89e7c7e6be..4e8a87a9b451e9ed9f10b30790346a052667f954 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -96,7 +96,7 @@ static inline int wxMacTabMargin(long nbStyle, long side)
     // but we have to special case wxNB_TOP since it is zero...
     if ( side == wxNB_TOP)
     {
     // 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)
+        if ( nbStyle != 0 && nbStyle & (wxNB_LEFT|wxNB_RIGHT|wxNB_BOTTOM))

         {
             return otherMargin;
         }
         {
             return otherMargin;
         }


@@ -202,7 +202,7 @@ wxNotebook::~wxNotebook()
     m_macControl = NULL ;
 }
 
     m_macControl = NULL ;
 }
 

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

 {
     wxSize sizeTotal = sizePage;
 
 {
     wxSize sizeTotal = sizePage;
 


@@ -614,7 +614,7 @@ void  wxNotebook::OnMouse( wxMouseEvent &event )
                 wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
                     ::GetControl32BitValue(control) - 1, m_nSelection);
                 changing.SetEventObject(this);
                 wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
                     ::GetControl32BitValue(control) - 1, m_nSelection);
                 changing.SetEventObject(this);

-                ProcessEvent(changing);
+                GetEventHandler()->ProcessEvent(changing);

 
                 if(changing.IsAllowed())
                 {
 
                 if(changing.IsAllowed())
                 {


@@ -626,7 +626,7 @@ void  wxNotebook::OnMouse( wxMouseEvent &event )
                         ::GetControl32BitValue(control) - 1, m_nSelection);
                     event.SetEventObject(this);
 
                         ::GetControl32BitValue(control) - 1, m_nSelection);
                     event.SetEventObject(this);
 

-                    ProcessEvent(event);
+                    GetEventHandler()->ProcessEvent(event);

                 }
             }
         }
                 }
             }
         }


@@ -634,7 +634,7 @@ void  wxNotebook::OnMouse( wxMouseEvent &event )
 }
 
 
 }
 
 

-void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
+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);
 {
 #if 0
     wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControl32BitValue((ControlHandle)m_macControl) - 1, m_nSelection);