argh, really, really fix Darwin build

[wxWidgets.git] / include / wx / msw / apptrait.h

diff --git a/include/wx/msw/apptrait.h b/include/wx/msw/apptrait.h
index 5d3e733ef315a5f624d76d276e581cf30d6533c3..aca686e5fad1a13907fa59193024d3ac7e0852b4 100644 (file)
--- a/include/wx/msw/apptrait.h
+++ b/include/wx/msw/apptrait.h
@@ -19,11 +19,15 @@
 class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
 class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:

+    virtual wxEventLoopBase *CreateEventLoop();

     virtual void *BeforeChildWaitLoop();
     virtual void AlwaysYield();
     virtual void AfterChildWaitLoop(void *data);
     virtual void *BeforeChildWaitLoop();
     virtual void AlwaysYield();
     virtual void AfterChildWaitLoop(void *data);

-
+#if wxUSE_TIMER
+    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
+#endif

     virtual bool DoMessageFromThreadWait();
     virtual bool DoMessageFromThreadWait();

+    virtual WXDWORD WaitForThread(WXHANDLE hThread);

 };
 
 #if wxUSE_GUI
 };
 
 #if wxUSE_GUI


@@ -31,12 +35,16 @@ public:
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:

+    virtual wxEventLoopBase *CreateEventLoop();

     virtual void *BeforeChildWaitLoop();
     virtual void AlwaysYield();
     virtual void AfterChildWaitLoop(void *data);
     virtual void *BeforeChildWaitLoop();
     virtual void AlwaysYield();
     virtual void AfterChildWaitLoop(void *data);

-
+#if wxUSE_TIMER
+    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
+#endif

     virtual bool DoMessageFromThreadWait();
     virtual bool DoMessageFromThreadWait();

-    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
+    virtual WXDWORD WaitForThread(WXHANDLE hThread);

 };
 
 #endif // wxUSE_GUI
 };
 
 #endif // wxUSE_GUI