Add XRC handler for wxToolbook.

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

diff --git a/include/wx/msw/apptrait.h b/include/wx/msw/apptrait.h
index d4d89c0141b1f31ec4e0776685d7ee66d42fe19b..418356b169f9b83e6c5f6880b5e0f953108a7eb6 100644 (file)
--- a/include/wx/msw/apptrait.h
+++ b/include/wx/msw/apptrait.h
@@ -19,14 +19,18 @@
 class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
 class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:

+    virtual wxEventLoopBase *CreateEventLoop();

     virtual void *BeforeChildWaitLoop();
     virtual void *BeforeChildWaitLoop();

-    virtual void AlwaysYield();

     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
     virtual bool DoMessageFromThreadWait();
     virtual WXDWORD WaitForThread(WXHANDLE hThread);
     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
     virtual bool DoMessageFromThreadWait();
     virtual WXDWORD WaitForThread(WXHANDLE hThread);

+#ifndef __WXWINCE__
+    virtual bool CanUseStderr() { return true; }
+    virtual bool WriteToStderr(const wxString& text);
+#endif // !__WXWINCE__

 };
 
 #if wxUSE_GUI
 };
 
 #if wxUSE_GUI


@@ -34,18 +38,22 @@ public:
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:

+    virtual wxEventLoopBase *CreateEventLoop();

     virtual void *BeforeChildWaitLoop();
     virtual void *BeforeChildWaitLoop();

-    virtual void AlwaysYield();

     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
     virtual bool DoMessageFromThreadWait();
     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
     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);
     virtual WXDWORD WaitForThread(WXHANDLE hThread);

+
+#ifndef __WXWINCE__
+    virtual bool CanUseStderr();
+    virtual bool WriteToStderr(const wxString& text);
+#endif // !__WXWINCE__

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

-