Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h
index 37e69eafeca5e0a3385cf603fd39f75ea9d3f9a1..d9d1cd8aed12d3c9340b39ba9156fc5b4931d584 100644 (file)
--- a/include/wx/os2/apptrait.h
+++ b/include/wx/os2/apptrait.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Neis
 // Modified by:
 // Created:     22.09.2003
 // Author:      Stefan Neis
 // Modified by:
 // Created:     22.09.2003

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003 Stefan Neis <Stefan.Neis@t-online.de>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 Stefan Neis <Stefan.Neis@t-online.de>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -19,9 +18,11 @@
 class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
 class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:

+#if wxUSE_CONSOLE_EVENTLOOP

     virtual wxEventLoopBase *CreateEventLoop();
     virtual wxEventLoopBase *CreateEventLoop();

+#endif // wxUSE_CONSOLE_EVENTLOOP

 #if wxUSE_TIMER
 #if wxUSE_TIMER

-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) { return NULL; };
+    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);

 #endif
 };
 
 #endif
 };
 


@@ -30,10 +31,11 @@ public:
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:

+    virtual wxEventLoopBase *CreateEventLoop();

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

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

 
     // wxThread helpers
     // ----------------
 
     // wxThread helpers
     // ----------------


@@ -46,8 +48,21 @@ public:
 #ifdef __WXGTK__
     virtual wxString GetDesktopEnvironment() const;
 #endif
 #ifdef __WXGTK__
     virtual wxString GetDesktopEnvironment() const;
 #endif

+#if wxUSE_SOCKETS
+    virtual wxFDIOManager *GetFDIOManager();
+#endif

 };
 
 };
 

+#ifndef __WXPM__
+inline void wxGUIAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab))
+{
+}
+
+inline void wxGUIAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab))
+{
+}
+#endif
+

 #endif // wxUSE_GUI
 
 #endif // _WX_OS2_APPTRAIT_H_
 #endif // wxUSE_GUI
 
 #endif // _WX_OS2_APPTRAIT_H_