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

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

diff --git a/include/wx/evtloopsrc.h b/include/wx/evtloopsrc.h
index b626bdff4c27228ed04784f9f8e47885326e28c7..cb3e5c6a9064b6ae4ab1ee4a5bfc660e90360990 100644 (file)
--- a/include/wx/evtloopsrc.h
+++ b/include/wx/evtloopsrc.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxEventLoopSource class
 // Author:      Vadim Zeitlin
 // Created:     2009-10-21
 // Purpose:     declaration of wxEventLoopSource class
 // Author:      Vadim Zeitlin
 // Created:     2009-10-21

-// RCS-ID:      $Id: wxhead.h,v 1.11 2009-06-29 10:23:04 zeitlin Exp $

 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -11,6 +10,9 @@
 #ifndef _WX_EVTLOOPSRC_H_
 #define _WX_EVTLOOPSRC_H_
 
 #ifndef _WX_EVTLOOPSRC_H_
 #define _WX_EVTLOOPSRC_H_
 

+// Include the header to get wxUSE_EVENTLOOP_SOURCE definition from it.
+#include "wx/evtloop.h"
+

 // ----------------------------------------------------------------------------
 // wxEventLoopSource: a source of events which may be added to wxEventLoop
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxEventLoopSource: a source of events which may be added to wxEventLoop
 // ----------------------------------------------------------------------------


@@ -49,7 +51,7 @@ enum
     wxEVENT_SOURCE_EXCEPTION = 0x04,
     wxEVENT_SOURCE_ALL = wxEVENT_SOURCE_INPUT |
                          wxEVENT_SOURCE_OUTPUT |
     wxEVENT_SOURCE_EXCEPTION = 0x04,
     wxEVENT_SOURCE_ALL = wxEVENT_SOURCE_INPUT |
                          wxEVENT_SOURCE_OUTPUT |

-                         wxEVENT_SOURCE_EXCEPTION,
+                         wxEVENT_SOURCE_EXCEPTION

 };
 
 // wxEventLoopSource itself is an ABC and can't be created directly, currently
 };
 
 // wxEventLoopSource itself is an ABC and can't be created directly, currently


@@ -89,9 +91,11 @@ inline wxEventLoopSource::~wxEventLoopSource() { }
 
 #if defined(__WXGTK20__)
     #include "wx/gtk/evtloopsrc.h"
 
 #if defined(__WXGTK20__)
     #include "wx/gtk/evtloopsrc.h"

-#elif defined(__WXOSX__)
+#endif
+
+#if defined(__DARWIN__)

     #include "wx/osx/evtloopsrc.h"
     #include "wx/osx/evtloopsrc.h"

-#endif // platform
+#endif

 
 #endif // wxUSE_EVENTLOOP_SOURCE
 
 
 #endif // wxUSE_EVENTLOOP_SOURCE