Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / popupwin.h

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 03bb274c5a4d97486c7605e3211604d2f1c1f8dd..6b61517f39f7df70472b94b5e0a2cac9698eb7c6 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.01.01
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.01.01

-// RCS-ID:      $Id$

 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -66,8 +65,6 @@ public:
     #include "wx/motif/popupwin.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/popupwin.h"
     #include "wx/motif/popupwin.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/popupwin.h"

-#elif defined(__WXMGL__)
-    #include "wx/mgl/popupwin.h"

 #elif defined(__WXMAC__)
     #include "wx/osx/popupwin.h"
 #else
 #elif defined(__WXMAC__)
     #include "wx/osx/popupwin.h"
 #else


@@ -132,8 +129,9 @@ protected:
     // get alerted when child gets deleted from under us
     void OnDestroy(wxWindowDestroyEvent& event);
 
     // get alerted when child gets deleted from under us
     void OnDestroy(wxWindowDestroyEvent& event);
 

-#if defined( __WXMSW__ ) || defined( __WXMAC__)
-    // check if the mouse needs captured or released
+#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON)
+    // Check if the mouse needs to be captured or released: we must release
+    // when it's inside our window if we want the embedded controls to work.

     void OnIdle(wxIdleEvent& event);
 #endif
 
     void OnIdle(wxIdleEvent& event);
 #endif