From 4ce3452d329e67859c4ccc195b1e6779c914a32c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 8 Dec 2011 14:47:37 +0000
Subject: [PATCH] Only declare wxComboBox::Popup/Dismiss() when using Cocoa in
 wxOSX.

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
---
 include/wx/osx/combobox.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index 5d8e2f3..05c14a9 100644
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -139,8 +139,10 @@ class WXDLLIMPEXP_CORE wxComboBox :
     virtual wxTextWidgetImpl* GetTextPeer() const;
 #endif // wxOSX_USE_CARBON
 
+#if wxOSX_USE_COCOA
     virtual void Popup();
     virtual void Dismiss();
+#endif // wxOSX_USE_COCOA
 
 
     // osx specific event handling common for all osx-ports
-- 
2.7.4