X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6fad7ae1d573ac7f438a2e45bee28d1689e7421a..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/os2/apptrait.h

diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h
index 37e69eafec..e179703374 100644
--- a/include/wx/os2/apptrait.h
+++ b/include/wx/os2/apptrait.h
@@ -19,9 +19,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
 };
 
@@ -30,10 +32,11 @@ public:
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
+    virtual wxEventLoopBase *CreateEventLoop();
 #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
     // ----------------
@@ -46,6 +49,9 @@ public:
 #ifdef __WXGTK__
     virtual wxString GetDesktopEnvironment() const;
 #endif
+#if wxUSE_SOCKETS
+    virtual GSocketManager *GetSocketManager();
+#endif
 };
 
 #endif // wxUSE_GUI