removing outdated files on mac

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

diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h
index c4b107a0edafa11314536924f24c8bcf41c41ed7..cd9fa56e54c7ffbfbeb4dd84fc2528a2a19324b9 100644 (file)
--- a/include/wx/os2/apptrait.h
+++ b/include/wx/os2/apptrait.h
@@ -19,6 +19,12 @@
 class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
 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);
+#endif

 };
 
 #if wxUSE_GUI
 };
 
 #if wxUSE_GUI


@@ -26,7 +32,11 @@ public:
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:

-    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+    virtual wxEventLoopBase *CreateEventLoop();
+#if wxUSE_TIMER
+    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
+#endif
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;

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


@@ -36,8 +46,24 @@ public:
 
     // Clean up message queue.
     virtual void TerminateGui(unsigned long ulHab);
 
     // Clean up message queue.
     virtual void TerminateGui(unsigned long ulHab);

+#ifdef __WXGTK__
+    virtual wxString GetDesktopEnvironment() const;
+#endif
+#if wxUSE_SOCKETS
+    virtual GSocketManager *GetSocketManager();
+#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_