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

Only declare wxComboBox::Popup/Dismiss() when using Cocoa in wxOSX.

Browse Source 
wxOSX/Carbon doesn't use the core implementation file so declaring these
methods for the Carbon version resulted in linking errors. Just don't do this,
they're not implemented for Carbon anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-12-08 14:47:37 +00:00
parent 53943b06e4
commit 4ce3452d32
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/combobox.h
View File

@@ -139,8 +139,10 @@ class WXDLLIMPEXP_CORE wxComboBox :
virtual wxTextWidgetImpl* GetTextPeer() const; virtual wxTextWidgetImpl* GetTextPeer() const;
#endif // wxOSX_USE_CARBON #endif // wxOSX_USE_CARBON
#if wxOSX_USE_COCOA
virtual void Popup(); virtual void Popup();
virtual void Dismiss(); virtual void Dismiss();
#endif // wxOSX_USE_COCOA
// osx specific event handling common for all osx-ports // osx specific event handling common for all osx-ports