fix WinCE compilation after tbar95.h ->t oolbar.h renaming (#10197)

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

diff --git a/include/wx/palmos/apptrait.h b/include/wx/palmos/apptrait.h
index 24e0ef34a64ca4fc8eb6f9821fdb16eba626fca7..f8eef8d38916b0a8c0f7ca9ff14b1214f7dcfca5 100644 (file)
--- a/include/wx/palmos/apptrait.h
+++ b/include/wx/palmos/apptrait.h
@@ -1,16 +1,20 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/apptrait.h
 // Purpose:     class implementing wxAppTraits for Palm OS
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/apptrait.h
 // Purpose:     class implementing wxAppTraits for Palm OS

-// Author:      William Osborne
-// Modified by:
+// Author:      William Osborne - minimal working wxPalmOS port
+// Modified by: Yunhui Fu

 // Created:     10/13/04
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_MSW_APPTRAIT_H_
-#define _WX_MSW_APPTRAIT_H_
+#ifndef _WX_PALM_APPTRAIT_H_
+#define _WX_PALM_APPTRAIT_H_
+
+#if wxUSE_TIMER
+#include "wx/palmos/private/timer.h" // wxPalmOSTimerImpl
+#endif // wxUSE_TIMER

 
 // ----------------------------------------------------------------------------
 // wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
 
 // ----------------------------------------------------------------------------
 // wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase


@@ -19,11 +23,17 @@
 class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
 class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:

+#if wxUSE_CONSOLE_EVENTLOOP
+    virtual wxEventLoopBase *CreateEventLoop();
+#endif // wxUSE_CONSOLE_EVENTLOOP

     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) { return new wxPalmOSTimerImpl(timer); }
+#endif

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

+    virtual WXDWORD WaitForThread(WXHANDLE hThread);

 };
 
 #if wxUSE_GUI
 };
 
 #if wxUSE_GUI


@@ -31,15 +41,19 @@ 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
+    // there is no wxTimer support yet
+    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
+#endif

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

-    virtual wxToolkitInfo& GetToolkitInfo();
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;

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

-#endif // _WX_MSW_APPTRAIT_H_
+#endif // _WX_PALM_APPTRAIT_H_