Set HTML data even in Unicode mode

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 3bc3131591cd8c628bc76ca380797a87b5100c7b..27f5e30b912b6c0aa78aed5b982bec82c56d3c72 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        notebook.cpp
+// Name:        src/mac/carbon/notebmac.cpp

 // Purpose:     implementation of wxNotebook
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     implementation of wxNotebook
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "notebook.h"
-#endif
-

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -47,7 +43,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
 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)
 
     EVT_SIZE(wxNotebook::OnSize)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)


@@ -98,8 +94,8 @@ bool wxNotebook::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
                         long style,
                         const wxString& name)
 {

-    m_macIsUserPane = FALSE ;
-    
+    m_macIsUserPane = false ;
+

     if ( !wxNotebookBase::Create(parent, id, pos, size, style, name) )
         return false;
 
     if ( !wxNotebookBase::Create(parent, id, pos, size, style, name) )
         return false;
 


@@ -111,31 +107,31 @@ bool wxNotebook::Create(wxWindow *parent,
         bounds.bottom = bounds.top + 100 ;
 
     UInt16 tabstyle = kControlTabDirectionNorth ;
         bounds.bottom = bounds.top + 100 ;
 
     UInt16 tabstyle = kControlTabDirectionNorth ;

-    if ( HasFlag(wxNB_LEFT) )
+    if ( HasFlag(wxBK_LEFT) )

         tabstyle = kControlTabDirectionWest ;
         tabstyle = kControlTabDirectionWest ;

-    else if ( HasFlag( wxNB_RIGHT ) )
+    else if ( HasFlag( wxBK_RIGHT ) )

         tabstyle = kControlTabDirectionEast ;
         tabstyle = kControlTabDirectionEast ;

-    else if ( HasFlag( wxNB_BOTTOM ) )
+    else if ( HasFlag( wxBK_BOTTOM ) )

         tabstyle = kControlTabDirectionSouth ;
         tabstyle = kControlTabDirectionSouth ;

-        
+

     ControlTabSize tabsize = kControlTabSizeLarge ;
     if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
         tabsize = kControlTabSizeSmall ;
     else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
     {
         if (UMAGetSystemVersion() >= 0x1030 )
     ControlTabSize tabsize = kControlTabSizeLarge ;
     if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
         tabsize = kControlTabSizeSmall ;
     else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
     {
         if (UMAGetSystemVersion() >= 0x1030 )

-            tabsize = 3 ; 
+            tabsize = 3 ;

         else
         else

-            tabsize = kControlSizeSmall; 
+            tabsize = kControlSizeSmall;

     }
 
     m_peer = new wxMacControl(this) ;
     verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
     }
 
     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) ;
     MacPostControlCreate(pos,size) ;

-    return TRUE ;
+    return true ;

 }
 
 // dtor
 }
 
 // dtor


@@ -169,7 +165,7 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
 
 int wxNotebook::SetSelection(size_t nPage)
 {
 
 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 )
     {
 
     if ( int(nPage) != m_nSelection )
     {


@@ -211,16 +207,16 @@ wxString wxNotebook::GetPageText(size_t nPage) const
 
 int wxNotebook::GetPageImage(size_t nPage) const
 {
 
 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)
 {
 
     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] )
         _T("invalid image index in SetPageImage()") );
 
     if ( nImage != m_images[nPage] )


@@ -233,7 +229,7 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
         MacSetupTabs() ;
     }
 
         MacSetupTabs() ;
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -266,7 +262,7 @@ bool wxNotebook::DeleteAllPages()
     MacSetupTabs();
     m_nSelection = -1 ;
     InvalidateBestSize();
     MacSetupTabs();
     m_nSelection = -1 ;
     InvalidateBestSize();

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -305,13 +301,13 @@ bool wxNotebook::InsertPage(size_t nPage,
     // if the inserted page is before the selected one, we must update the
     // index of the selected page
 
     // 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 ) ;
     }
     {
         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;
     // some page should be selected: either this one or the first one if there
     // is still no selection
     int selNew = -1;


@@ -337,17 +333,17 @@ void wxNotebook::MacSetupTabs()
     m_peer->SetMaximum( GetPageCount() ) ;
 
     wxNotebookPage *page;
     m_peer->SetMaximum( GetPageCount() ) ;
 
     wxNotebookPage *page;

-    ControlTabInfoRec info;
+    ControlTabInfoRecV1 info;

 
     const size_t countPages = GetPageCount();
     for(size_t ii = 0; ii < countPages; ii++)
     {
         page = m_pages[ii];
 
     const size_t countPages = GetPageCount();
     for(size_t ii = 0; ii < countPages; ii++)
     {
         page = m_pages[ii];

-        info.version = 0;
+        info.version = kControlTabInfoVersionOne;

         info.iconSuiteID = 0;
         info.iconSuiteID = 0;

-        wxMacStringToPascal( page->GetLabel() , info.name ) ;
-        m_peer->SetData<ControlTabInfoRec>( ii+1, kControlTabInfoTag, &info ) ;
-        m_peer->SetTabEnabled( ii + 1 , true ) ;
+        wxMacCFStringHolder cflabel( page->GetLabel() , m_font.GetEncoding() ) ;
+        info.name = cflabel ;
+        m_peer->SetData<ControlTabInfoRecV1>( ii+1, kControlTabInfoTag, &info ) ;

 
         if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
         {
 
         if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
         {


@@ -357,12 +353,15 @@ void wxNotebook::MacSetupTabs()
                 ControlButtonContentInfo info ;
 
                 wxMacCreateBitmapButton( &info , bmap ) ;
                 ControlButtonContentInfo info ;
 
                 wxMacCreateBitmapButton( &info , bmap ) ;

-                OSStatus err = m_peer->SetData<ControlButtonContentInfo>( ii+1,kControlTabImageContentTag, &info );
+#ifdef __WXDEBUG__
+                OSStatus err =
+#endif // __WXDEBUG__
+                    m_peer->SetData<ControlButtonContentInfo>( ii+1,kControlTabImageContentTag, &info );

                 wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
                 wxMacReleaseBitmapButton( &info ) ;
             }
         }
                 wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
                 wxMacReleaseBitmapButton( &info ) ;
             }
         }

-
+        m_peer->SetTabEnabled( ii + 1 , true ) ;

     }
     Rect bounds;
     m_peer->GetRectInWindowCoords( &bounds ) ;
     }
     Rect bounds;
     m_peer->GetRectInWindowCoords( &bounds ) ;


@@ -481,13 +480,13 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 
 void wxNotebook::SetConstraintSizes(bool WXUNUSED(recurse))
 {
 
 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))
 {
 }
 
 bool wxNotebook::DoPhase(int WXUNUSED(nPhase))
 {

-  return TRUE;
+    return true;

 }
 
 #endif // wxUSE_CONSTRAINTS
 }
 
 #endif // wxUSE_CONSTRAINTS


@@ -504,26 +503,26 @@ void wxNotebook::Command(wxCommandEvent& event)
 // hide the currently active panel and show the new one
 void wxNotebook::ChangePage(int nOldSel, int nSel)
 {
 // 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];
     }
 
     if ( nSel != -1 )
     {
         wxNotebookPage *pPage = m_pages[nSel];

-        pPage->Show(TRUE);
+        pPage->Show(true);

         pPage->SetFocus();
     }
         pPage->SetFocus();
     }

-    
+

     m_nSelection = nSel;
     m_peer->SetValue( m_nSelection + 1 ) ;
 }
 
     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 ;
 {
     OSStatus status = eventNotHandledErr ;

-    
+

     SInt32 newSel = m_peer->GetValue() - 1 ;
     if ( newSel != m_nSelection )
     {
     SInt32 newSel = m_peer->GetValue() - 1 ;
     if ( newSel != m_nSelection )
     {


@@ -550,4 +549,3 @@ wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
 }
 
 #endif
 }
 
 #endif

-