Define INVALID_FILE_ATTRIBUTES in filename.cpp too.

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

diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h
index 34b5e30233e0a166991907764d6f579807edefcf..2cdb32a4a8b5235584c4260cb84510c02f5f3694 100644 (file)
--- a/include/wx/os2/apptrait.h
+++ b/include/wx/os2/apptrait.h
@@ -19,9 +19,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
 };
 


@@ -34,7 +36,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
     // ----------------


@@ -48,10 +50,20 @@ public:
     virtual wxString GetDesktopEnvironment() const;
 #endif
 #if wxUSE_SOCKETS
     virtual wxString GetDesktopEnvironment() const;
 #endif
 #if wxUSE_SOCKETS

-    virtual GSocketManager *GetSocketManager();
+    virtual wxFDIOManager *GetFDIOManager();

 #endif
 };
 
 #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_