correct hhp2cached path

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

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 168d34321321ef4572a6ff19e2803835b8a3bfc7..02778a1791c5dc59914f0436f535bbf336e38049 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -52,7 +52,7 @@ END_EVENT_TABLE()
 
 // when embedding native controls in the native toolbar we must make sure the
 // control does not get deleted behind our backs, so the retain count gets increased
 
 // when embedding native controls in the native toolbar we must make sure the
 // control does not get deleted behind our backs, so the retain count gets increased

-// (after creation it is 1), first be the creation of the custom HIToolbarItem wrapper 
+// (after creation it is 1), first be the creation of the custom HIToolbarItem wrapper

 // object, and second by the code 'creating' the custom HIView (which is the same as the
 // already existing native control, therefore we just increase the ref count)
 // when this view is removed from the native toolbar its count gets decremented again
 // object, and second by the code 'creating' the custom HIView (which is the same as the
 // already existing native control, therefore we just increase the ref count)
 // when this view is removed from the native toolbar its count gets decremented again


@@ -119,16 +119,19 @@ public:
         if ( m_toolbarItemRef )
         {
             CFIndex count = CFGetRetainCount( m_toolbarItemRef ) ;
         if ( m_toolbarItemRef )
         {
             CFIndex count = CFGetRetainCount( m_toolbarItemRef ) ;

-                       // different behaviour under Leopard
-                       if ( UMAGetSystemVersion() < 0x1050 )
-                       {
-                wxASSERT_MSG( count == 1 , wxT("Reference Count of native tool was not 1 in wxToolBarTool destructor") );
-                       }
+            // different behaviour under Leopard
+            if ( UMAGetSystemVersion() < 0x1050 )
+            {
+                if ( count != 1 )
+                {
+                    wxFAIL_MSG("Reference count of native tool was not 1 in wxToolBarTool destructor");
+                }
+            }

             wxTheApp->MacAddToAutorelease(m_toolbarItemRef);
             CFRelease(m_toolbarItemRef);
             m_toolbarItemRef = NULL;
         }
             wxTheApp->MacAddToAutorelease(m_toolbarItemRef);
             CFRelease(m_toolbarItemRef);
             m_toolbarItemRef = NULL;
         }

-#endif
+#endif // wxMAC_USE_NATIVE_TOOLBAR

     }
 
     wxSize GetSize() const
     }
 
     wxSize GetSize() const


@@ -187,8 +190,8 @@ public:
 
             HIToolbarItemSetHelpText(
                 m_toolbarItemRef,
 
             HIToolbarItemSetHelpText(
                 m_toolbarItemRef,

-                wxMacCFStringHolder( GetShortHelp(), enc ),
-                wxMacCFStringHolder( GetLongHelp(), enc ) );
+                wxCFStringRef( GetShortHelp(), enc ),
+                wxCFStringRef( GetLongHelp(), enc ) );

         }
     }
 
         }
     }
 


@@ -628,12 +631,15 @@ static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef,
                             // depending whether the wxControl corresponding to this HIView has already been destroyed or
                             // not, ref counts differ, so we cannot assert a special value
                             CFIndex count =  CFGetRetainCount( viewRef ) ;
                             // depending whether the wxControl corresponding to this HIView has already been destroyed or
                             // not, ref counts differ, so we cannot assert a special value
                             CFIndex count =  CFGetRetainCount( viewRef ) ;

-                            wxASSERT_MSG( count >=1 , wxT("Reference Count of native tool was illegal before removal") );

                             if ( count >= 1 )
                             if ( count >= 1 )

+                            {
+                                wxFAIL_MSG("Reference count of native tool was illegal before removal");
+

                                 CFRelease( viewRef ) ;
                                 CFRelease( viewRef ) ;

+                            }

                         }
                         }

-                           free( object ) ;
-                       result = noErr;
+                        free( object ) ;
+                        result = noErr;

                     }
                     break;
             }
                     }
                     break;
             }


@@ -680,7 +686,7 @@ static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef,
 
                         // Extra width to avoid edge of combobox being cut off
                         sz.x += 3;
 
                         // Extra width to avoid edge of combobox being cut off
                         sz.x += 3;

-                        
+

                         HISize min, max;
                         min.width = max.width = sz.x ;
                         min.height = max.height = sz.y ;
                         HISize min, max;
                         min.width = max.width = sz.x ;
                         min.height = max.height = sz.y ;


@@ -831,7 +837,7 @@ bool wxToolBar::Create(
     {
         wxString labelStr = wxString::Format( wxT("%p"), this );
         err = HIToolbarCreate(
     {
         wxString labelStr = wxString::Format( wxT("%p"), this );
         err = HIToolbarCreate(

-          wxMacCFStringHolder( labelStr, wxFont::GetDefaultEncoding() ), 0,
+          wxCFStringRef( labelStr, wxFont::GetDefaultEncoding() ), 0,

           (HIToolbarRef*) &m_macHIToolbarRef );
 
         if (m_macHIToolbarRef != NULL)
           (HIToolbarRef*) &m_macHIToolbarRef );
 
         if (m_macHIToolbarRef != NULL)


@@ -868,11 +874,14 @@ wxToolBar::~wxToolBar()
             MacInstallNativeToolbar( false );
 
         CFIndex count = CFGetRetainCount( m_macHIToolbarRef ) ;
             MacInstallNativeToolbar( false );
 
         CFIndex count = CFGetRetainCount( m_macHIToolbarRef ) ;

-               // Leopard seems to have one refcount more, so we cannot check reliably at the moment
-               if ( UMAGetSystemVersion() < 0x1050 )
-               {
-            wxASSERT_MSG( count == 1 , wxT("Reference Count of native control was not 1 in wxToolBar destructor") );
-               }
+        // Leopard seems to have one refcount more, so we cannot check reliably at the moment
+        if ( UMAGetSystemVersion() < 0x1050 )
+        {
+            if ( count != 1 )
+            {
+                wxFAIL_MSG("Reference count of native control was not 1 in wxToolBar destructor");
+            }
+        }

         CFRelease( (HIToolbarRef)m_macHIToolbarRef );
         m_macHIToolbarRef = NULL;
     }
         CFRelease( (HIToolbarRef)m_macHIToolbarRef );
         m_macHIToolbarRef = NULL;
     }


@@ -1183,7 +1192,11 @@ bool wxToolBar::Realize()
                                 if ( tool2->IsControl() )
                                 {
                                     CFIndex count = CFGetRetainCount( tool2->GetControl()->GetPeer()->GetControlRef() ) ;
                                 if ( tool2->IsControl() )
                                 {
                                     CFIndex count = CFGetRetainCount( tool2->GetControl()->GetPeer()->GetControlRef() ) ;

-                                    wxASSERT_MSG( count == 3 || count == 2 , wxT("Reference Count of native tool was illegal before removal") );
+                                    if ( count != 3 && count != 2 )
+                                    {
+                                        wxFAIL_MSG("Reference count of native tool was illegal before removal");
+                                    }
+

                                     wxASSERT( IsValidControlHandle(tool2->GetControl()->GetPeer()->GetControlRef() )) ;
                                 }
                                 err = HIToolbarRemoveItemAtIndex(refTB, idx);
                                     wxASSERT( IsValidControlHandle(tool2->GetControl()->GetPeer()->GetControlRef() )) ;
                                 }
                                 err = HIToolbarRemoveItemAtIndex(refTB, idx);


@@ -1195,7 +1208,11 @@ bool wxToolBar::Realize()
                                 if ( tool2->IsControl() )
                                 {
                                     CFIndex count = CFGetRetainCount( tool2->GetControl()->GetPeer()->GetControlRef() ) ;
                                 if ( tool2->IsControl() )
                                 {
                                     CFIndex count = CFGetRetainCount( tool2->GetControl()->GetPeer()->GetControlRef() ) ;

-                                    wxASSERT_MSG( count == 2 , wxT("Reference Count of native tool was not 2 after removal") );
+                                    if ( count != 2 )
+                                    {
+                                        wxFAIL_MSG("Reference count of native tool was not 2 after removal");
+                                    }
+

                                     wxASSERT( IsValidControlHandle(tool2->GetControl()->GetPeer()->GetControlRef() )) ;
                                 }
 
                                     wxASSERT( IsValidControlHandle(tool2->GetControl()->GetPeer()->GetControlRef() )) ;
                                 }
 


@@ -1214,7 +1231,10 @@ bool wxToolBar::Realize()
                     if ( tool->IsControl() )
                     {
                         CFIndex count = CFGetRetainCount( tool->GetControl()->GetPeer()->GetControlRef() ) ;
                     if ( tool->IsControl() )
                     {
                         CFIndex count = CFGetRetainCount( tool->GetControl()->GetPeer()->GetControlRef() ) ;

-                        wxASSERT_MSG( count == 3 || count == 2, wxT("Reference Count of native tool was illegal after insertion") );
+                        if ( count != 3 && count != 2 )
+                        {
+                            wxFAIL_MSG("Reference count of native tool was illegal before removal");
+                        }

                         wxASSERT( IsValidControlHandle(tool->GetControl()->GetPeer()->GetControlRef() )) ;
                     }
                 }
                         wxASSERT( IsValidControlHandle(tool->GetControl()->GetPeer()->GetControlRef() )) ;
                     }
                 }


@@ -1516,7 +1536,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
                     HIToolbarItemRef item;
                     wxString labelStr = wxString::Format(wxT("%p"), tool);
                     err = HIToolbarItemCreate(
                     HIToolbarItemRef item;
                     wxString labelStr = wxString::Format(wxT("%p"), tool);
                     err = HIToolbarItemCreate(

-                        wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()),
+                        wxCFStringRef(labelStr, wxFont::GetDefaultEncoding()),

                         kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item );
                     if (err  == noErr)
                     {
                         kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item );
                     if (err  == noErr)
                     {


@@ -1526,7 +1546,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
                         InstallEventHandler(
                             HIObjectGetEventTarget(item), GetwxMacToolBarEventHandlerUPP(),
                             GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL );
                         InstallEventHandler(
                             HIObjectGetEventTarget(item), GetwxMacToolBarEventHandlerUPP(),
                             GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL );

-                        HIToolbarItemSetLabel( item, wxMacCFStringHolder(label, m_font.GetEncoding()) );
+                        HIToolbarItemSetLabel( item, wxCFStringRef(label, GetFont().GetEncoding()) );

                         HIToolbarItemSetImage( item, info2.u.imageRef );
                         HIToolbarItemSetCommandID( item, kHIToolbarCommandPressAction );
                         tool->SetToolbarItemRef( item );
                         HIToolbarItemSetImage( item, info2.u.imageRef );
                         HIToolbarItemSetCommandID( item, kHIToolbarCommandPressAction );
                         tool->SetToolbarItemRef( item );


@@ -1542,7 +1562,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 
 #if 0
                 SetBevelButtonTextPlacement( m_controlHandle, kControlBevelButtonPlaceBelowGraphic );
 
 #if 0
                 SetBevelButtonTextPlacement( m_controlHandle, kControlBevelButtonPlaceBelowGraphic );

-                SetControlTitleWithCFString( m_controlHandle , wxMacCFStringHolder( label, wxFont::GetDefaultEncoding() );
+                SetControlTitleWithCFString( m_controlHandle , wxCFStringRef( label, wxFont::GetDefaultEncoding() );

 #endif
 
                 InstallControlEventHandler(
 #endif
 
                 InstallControlEventHandler(