Compilation fix for wxOSX/Cocoa with wxOSX_USE_NATIVE_TOOLBAR==0.
Don't use m_macToolbar when not using the native toolbar. Do compile GetToolBarFontEncoding() which is used in any case. Closes #15629. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -254,7 +254,6 @@ public:
|
||||
#endif // wxOSX_USE_NATIVE_TOOLBAR
|
||||
|
||||
private:
|
||||
#if wxOSX_USE_NATIVE_TOOLBAR
|
||||
wxFontEncoding GetToolBarFontEncoding() const
|
||||
{
|
||||
wxFont f;
|
||||
@@ -262,7 +261,6 @@ private:
|
||||
f = GetToolBar()->GetFont();
|
||||
return f.IsOk() ? f.GetEncoding() : wxFont::GetDefaultEncoding();
|
||||
}
|
||||
#endif // wxOSX_USE_NATIVE_TOOLBAR
|
||||
|
||||
void Init()
|
||||
{
|
||||
@@ -689,9 +687,11 @@ wxToolBar::~wxToolBar()
|
||||
frame->SetToolBar(NULL);
|
||||
}
|
||||
|
||||
#if wxOSX_USE_NATIVE_TOOLBAR
|
||||
[(NSToolbar*)m_macToolbar setDelegate:nil];
|
||||
[(NSToolbar*)m_macToolbar release];
|
||||
m_macToolbar = NULL;
|
||||
#endif // wxOSX_USE_NATIVE_TOOLBAR
|
||||
}
|
||||
|
||||
bool wxToolBar::Show( bool show )
|
||||
|
Reference in New Issue
Block a user