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

diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index 5d8e2f3b11e95c9e36539c43ba476febb5b90ff4..05c14a96aa5ca69e8301db02ecf9090fcb7371d0 100644 (file)
--- 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
 
     virtual wxTextWidgetImpl* GetTextPeer() const;
 #endif // wxOSX_USE_CARBON
 

+#if wxOSX_USE_COCOA

     virtual void Popup();
     virtual void Dismiss();
     virtual void Popup();
     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