Added wxMSW wxChoice::GetClassDefaultAttributes(), initially used in wxComboCtrl

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

diff --git a/include/wx/osx/evtloop.h b/include/wx/osx/evtloop.h
index 19410d62d8c6528f652b0469a40e49f043298d44..a295706f588a26cc0efc0f3a8d74ff28eeb479ad 100644 (file)
--- a/include/wx/osx/evtloop.h
+++ b/include/wx/osx/evtloop.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/mac/evtloop.h
+// Name:        include/wx/osx/evtloop.h

 // Purpose:     simply forwards to wx/mac/carbon/evtloop.h for consistency with
 //              the other Mac headers
 // Author:      Vadim Zeitlin
 // Purpose:     simply forwards to wx/mac/carbon/evtloop.h for consistency with
 //              the other Mac headers
 // Author:      Vadim Zeitlin


@@ -10,9 +10,30 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __WXMAC_CLASSIC__
-    #error "wxEventLoop is not implemented for Classic build."
-#else
-    #include "wx/osx/carbon/evtloop.h"
-#endif
+#ifndef _WX_OSX_EVTLOOP_H_
+#define _WX_OSX_EVTLOOP_H_

 
 

+typedef struct __CFRunLoop * CFRunLoopRef;
+
+class WXDLLIMPEXP_BASE wxCFEventLoop : public wxEventLoopManual
+{
+public:
+#if wxUSE_EVENTLOOP_SOURCE
+    virtual wxEventLoopSource *
+      AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags);
+#endif // wxUSE_EVENTLOOP_SOURCE
+
+protected:
+    // get the currently executing CFRunLoop
+    virtual CFRunLoopRef CFGetCurrentRunLoop() const = 0;
+};
+
+#if wxUSE_GUI
+    #ifdef __WXOSX_COCOA__
+        #include "wx/osx/cocoa/evtloop.h"
+    #else
+        #include "wx/osx/carbon/evtloop.h"
+    #endif
+#endif // wxUSE_GUI
+
+#endif // _WX_OSX_EVTLOOP_H_