unicode fixes, enabling notebook images again

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 6e2d2d6137a1a3333e40fa1272782fc082bb8b65..b17214fb389069a65d8f0bd928b7e04c6eae2daf 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -74,7 +74,7 @@ void wxMenu::Init()
 
     if ( !m_hMenu )
     {
-        wxLogLastError("UMANewMenu failed");
+        wxLogLastError(wxT("UMANewMenu failed"));
     }
 
     // if we have a title, insert it in the beginning of the menu

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 5ed215b7aba37d211f628a4081170f29f9145c27..c95eadadcd41fddd8aa7e9dc48f6ebdaa0d3c359 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -417,7 +417,7 @@ void wxNotebook::MacSetupTabs()
         SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag,
             sizeof( ControlTabInfoRec) , (char*) &info ) ;
         SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ;
-#if 0 // TARGET_CARBON
+#if TARGET_CARBON
         if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
         {
             // tab controls only support very specific types of images, therefore we are doing an odyssee
@@ -430,15 +430,15 @@ void wxNotebook::MacSetupTabs()
             wxMacCreateBitmapButton( &info , *GetImageList()->GetBitmap( GetPageImage(ii ) ) , kControlContentPictHandle) ;
             IconFamilyHandle iconFamily = (IconFamilyHandle) NewHandle(0) ;
             OSErr err = SetIconFamilyData( iconFamily, 'PICT' , (Handle) info.u.picture ) ;
-            wxASSERT_MSG( err == noErr , "Error when adding bitmap" ) ;
+            wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
             IconRef iconRef ;
             err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1 , iconFamily, &iconRef ) ;
-            wxASSERT_MSG( err == noErr , "Error when adding bitmap" ) ;
+            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 );
-            wxASSERT_MSG( err == noErr , "Error when setting icon on tab" ) ;
+            wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
                UnregisterIconRef( 'WXNG' , (OSType) 1 ) ;
             ReleaseIconRef( iconRef ) ;
             DisposeHandle( (Handle) iconFamily ) ;

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 6e2d2d6137a1a3333e40fa1272782fc082bb8b65..b17214fb389069a65d8f0bd928b7e04c6eae2daf 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -74,7 +74,7 @@ void wxMenu::Init()
 
     if ( !m_hMenu )
     {
-        wxLogLastError("UMANewMenu failed");
+        wxLogLastError(wxT("UMANewMenu failed"));
     }
 
     // if we have a title, insert it in the beginning of the menu

diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp
index 5ed215b7aba37d211f628a4081170f29f9145c27..c95eadadcd41fddd8aa7e9dc48f6ebdaa0d3c359 100644 (file)
--- a/src/mac/notebmac.cpp
+++ b/src/mac/notebmac.cpp
@@ -417,7 +417,7 @@ void wxNotebook::MacSetupTabs()
         SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag,
             sizeof( ControlTabInfoRec) , (char*) &info ) ;
         SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ;
-#if 0 // TARGET_CARBON
+#if TARGET_CARBON
         if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
         {
             // tab controls only support very specific types of images, therefore we are doing an odyssee
@@ -430,15 +430,15 @@ void wxNotebook::MacSetupTabs()
             wxMacCreateBitmapButton( &info , *GetImageList()->GetBitmap( GetPageImage(ii ) ) , kControlContentPictHandle) ;
             IconFamilyHandle iconFamily = (IconFamilyHandle) NewHandle(0) ;
             OSErr err = SetIconFamilyData( iconFamily, 'PICT' , (Handle) info.u.picture ) ;
-            wxASSERT_MSG( err == noErr , "Error when adding bitmap" ) ;
+            wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
             IconRef iconRef ;
             err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1 , iconFamily, &iconRef ) ;
-            wxASSERT_MSG( err == noErr , "Error when adding bitmap" ) ;
+            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 );
-            wxASSERT_MSG( err == noErr , "Error when setting icon on tab" ) ;
+            wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
                UnregisterIconRef( 'WXNG' , (OSType) 1 ) ;
             ReleaseIconRef( iconRef ) ;
             DisposeHandle( (Handle) iconFamily ) ;