Added missing wx/defs.h includes in propgrid headers

[wxWidgets.git] / include / wx / osx / evtloop.h

diff --git a/include/wx/osx/evtloop.h b/include/wx/osx/evtloop.h
index bc6b5fddfe9a51502c3d9db9eb2f6defb10c5f04..35768078ad0241d273a2d3244bc7dda24c264665 100644 (file)
--- a/include/wx/osx/evtloop.h
+++ b/include/wx/osx/evtloop.h
@@ -1,7 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/osx/evtloop.h
-// Purpose:     simply forwards to wx/mac/carbon/evtloop.h for consistency with
-//              the other Mac headers
+// Name:        wx/osx/evtloop.h
+// Purpose:     simply forwards to wx/osx/carbon/evtloop.h or
+//              wx/osx/cocoa/evtloop.h for consistency with the other Mac
+//              headers
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-01-12
@@ -70,6 +71,9 @@ protected:
     // the loop exit code
     int m_exitcode;
     
+    // cfrunloop
+    CFRunLoopRef m_runLoop;
+    
     // runloop observer
     CFRunLoopObserverRef m_runLoopObserver;
     
@@ -95,7 +99,8 @@ class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
 class WXDLLIMPEXP_CORE wxModalEventLoop : public wxGUIEventLoop
 {
 public:
-    wxModalEventLoop(wxWindow *winModal);
+    wxModalEventLoop(wxWindow *modalWindow);
+    wxModalEventLoop(WXWindow modalNativeWindow);
     
 protected:
     virtual void DoRun();
@@ -104,6 +109,7 @@ protected:
     
     // (in case) the modal window for this event loop
     wxNonOwnedWindow* m_modalWindow;
+    WXWindow m_modalNativeWindow;
 };
 
 #endif // wxUSE_GUI