Add RunScript and implement on all backends. Document and add a very simple unit...

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

diff --git a/include/wx/palmos/apptrait.h b/include/wx/palmos/apptrait.h
index b6238ebd67495e4d5aa00b0742a9af46a3db0978..998649ad6a7bfaf3a6d0311945dc254f8a54740f 100644 (file)
--- a/include/wx/palmos/apptrait.h
+++ b/include/wx/palmos/apptrait.h
@@ -27,13 +27,14 @@ public:
     virtual wxEventLoopBase *CreateEventLoop();
 #endif // wxUSE_CONSOLE_EVENTLOOP
     virtual void *BeforeChildWaitLoop();
     virtual wxEventLoopBase *CreateEventLoop();
 #endif // wxUSE_CONSOLE_EVENTLOOP
     virtual void *BeforeChildWaitLoop();

-    virtual void AlwaysYield();

     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) { return new wxPalmOSTimerImpl(timer); }
     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) { return new wxPalmOSTimerImpl(timer); }

-#endif
+#endif // wxUSE_TIMER
+#if wxUSE_THREADS

     virtual bool DoMessageFromThreadWait();
     virtual WXDWORD WaitForThread(WXHANDLE hThread);
     virtual bool DoMessageFromThreadWait();
     virtual WXDWORD WaitForThread(WXHANDLE hThread);

+#endif // wxUSE_THREADS

 };
 
 #if wxUSE_GUI
 };
 
 #if wxUSE_GUI


@@ -43,14 +44,15 @@ class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 public:
     virtual wxEventLoopBase *CreateEventLoop();
     virtual void *BeforeChildWaitLoop();
 public:
     virtual wxEventLoopBase *CreateEventLoop();
     virtual void *BeforeChildWaitLoop();

-    virtual void AlwaysYield();

     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     // there is no wxTimer support yet
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     // there is no wxTimer support yet
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);

-#endif
+#endif // wxUSE_TIMER
+#if wxUSE_THREADS

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

-    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+#endif // wxUSE_THREADS
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;

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