Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fix for wxOSX/Cocoa with wxOSX_USE_NATIVE_TOOLBAR==0.

Browse Source 
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:
Vadim Zeitlin
2013-11-09 22:08:48 +00:00
parent 0e4f926b18
commit 9a368ea1cc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osx/cocoa/toolbar.mm
View File

@@ -254,7 +254,6 @@ public:
#endif // wxOSX_USE_NATIVE_TOOLBAR #endif // wxOSX_USE_NATIVE_TOOLBAR
private: private:
#if wxOSX_USE_NATIVE_TOOLBAR
wxFontEncoding GetToolBarFontEncoding() const wxFontEncoding GetToolBarFontEncoding() const
{ {
wxFont f; wxFont f;
@@ -262,7 +261,6 @@ private:
f = GetToolBar()->GetFont(); f = GetToolBar()->GetFont();
return f.IsOk() ? f.GetEncoding() : wxFont::GetDefaultEncoding(); return f.IsOk() ? f.GetEncoding() : wxFont::GetDefaultEncoding();
} }
#endif // wxOSX_USE_NATIVE_TOOLBAR
void Init() void Init()
{ {
@@ -689,9 +687,11 @@ wxToolBar::~wxToolBar()
frame->SetToolBar(NULL); frame->SetToolBar(NULL);
} }
#if wxOSX_USE_NATIVE_TOOLBAR
[(NSToolbar*)m_macToolbar setDelegate:nil]; [(NSToolbar*)m_macToolbar setDelegate:nil];
[(NSToolbar*)m_macToolbar release]; [(NSToolbar*)m_macToolbar release];
m_macToolbar = NULL; m_macToolbar = NULL;
#endif // wxOSX_USE_NATIVE_TOOLBAR
} }
bool wxToolBar::Show( bool show ) bool wxToolBar::Show( bool show )