use wx-style header and commets; fix indentation to be 4 spaces; move Doxygen comment...

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

diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h
index c77a07486a22c30070d7d135b4b953ff9aac19b0..cfd7acce888b43927489382d7394b1e377b74c41 100644 (file)
--- a/include/wx/os2/apptrait.h
+++ b/include/wx/os2/apptrait.h
@@ -34,7 +34,7 @@ public:
 #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
     // ----------------


@@ -47,6 +47,9 @@ public:
 #ifdef __WXGTK__
     virtual wxString GetDesktopEnvironment() const;
 #endif
 #ifdef __WXGTK__
     virtual wxString GetDesktopEnvironment() const;
 #endif

+#if wxUSE_SOCKETS
+    virtual GSocketManager *GetSocketManager();
+#endif

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