]> git.saurik.com Git - wxWidgets.git/commitdiff
currently avoid problems when releasing the capture during drag on osx_cocoa
authorStefan Csomor <csomor@advancedconcepts.ch>
Tue, 20 Apr 2010 19:07:42 +0000 (19:07 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Tue, 20 Apr 2010 19:07:42 +0000 (19:07 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/popupcmn.cpp

index 44eb9c7000ec01d1a08bd18c6d92a17f23f41e45..6c905a5fa4891c3bfe476c41296eb5832383dd0d 100644 (file)
@@ -109,7 +109,7 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
-#if defined( __WXMSW__ ) || defined( __WXMAC__)
+#if defined( __WXMSW__ ) || ( defined( __WXMAC__ ) && wxOSX_USE_CARBON )
     EVT_IDLE(wxPopupTransientWindow::OnIdle)
 #endif
 END_EVENT_TABLE()
@@ -405,7 +405,7 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
     return false;
 }
 
-#if defined( __WXMSW__ ) || defined( __WXMAC__)
+#if defined( __WXMSW__ ) || ( defined( __WXMAC__ ) && wxOSX_USE_CARBON )
 void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
 {
     event.Skip();