LP64 additions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -841,7 +841,7 @@ bool wxToolBar::Create(
|
|||||||
OSStatus err = noErr;
|
OSStatus err = noErr;
|
||||||
|
|
||||||
#if wxMAC_USE_NATIVE_TOOLBAR
|
#if wxMAC_USE_NATIVE_TOOLBAR
|
||||||
wxString labelStr = wxString::Format( wxT("%xd"), (int)this );
|
wxString labelStr = wxString::Format( wxT("%p"), this );
|
||||||
err = HIToolbarCreate(
|
err = HIToolbarCreate(
|
||||||
wxMacCFStringHolder( labelStr, wxFont::GetDefaultEncoding() ), 0,
|
wxMacCFStringHolder( labelStr, wxFont::GetDefaultEncoding() ), 0,
|
||||||
(HIToolbarRef*) &m_macHIToolbarRef );
|
(HIToolbarRef*) &m_macHIToolbarRef );
|
||||||
@@ -1502,7 +1502,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
|
|||||||
|
|
||||||
#if wxMAC_USE_NATIVE_TOOLBAR
|
#if wxMAC_USE_NATIVE_TOOLBAR
|
||||||
HIToolbarItemRef item;
|
HIToolbarItemRef item;
|
||||||
wxString labelStr = wxString::Format(wxT("%xd"), (int)tool);
|
wxString labelStr = wxString::Format(wxT("%p"), tool);
|
||||||
err = HIToolbarItemCreate(
|
err = HIToolbarItemCreate(
|
||||||
wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()),
|
wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()),
|
||||||
kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item );
|
kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item );
|
||||||
|
Reference in New Issue
Block a user