X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f5c66294a280b8408a4e1464f6468bb97d141b2..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/os2/apptrait.h?ds=sidebyside

diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h
index cfd7acce88..d9d1cd8aed 100644
--- 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
-// RCS-ID:      $Id$
 // Copyright:   (c) 2003 Stefan Neis <Stefan.Neis@t-online.de>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -19,9 +18,11 @@
 class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
+#if wxUSE_CONSOLE_EVENTLOOP
     virtual wxEventLoopBase *CreateEventLoop();
+#endif // wxUSE_CONSOLE_EVENTLOOP
 #if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) { return NULL; };
+    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
 };
 
@@ -48,10 +49,20 @@ public:
     virtual wxString GetDesktopEnvironment() const;
 #endif
 #if wxUSE_SOCKETS
-    virtual GSocketManager *GetSocketManager();
+    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_