projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor WM_COMMAND messages handling in MDI frames to avoid duplicating code unneces...
[wxWidgets.git]
/
include
/
wx
/
os2
/
apptrait.h
diff --git
a/include/wx/os2/apptrait.h
b/include/wx/os2/apptrait.h
index 37e69eafeca5e0a3385cf603fd39f75ea9d3f9a1..4038e880941428eaf6444dc229cead68189790da 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
};
@@
-30,10
+32,11
@@
public:
class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
{
public:
class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
{
public:
+ virtual wxEventLoopBase *CreateEventLoop();
#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
// ----------------
@@
-46,8
+49,21
@@
public:
#ifdef __WXGTK__
virtual wxString GetDesktopEnvironment() const;
#endif
#ifdef __WXGTK__
virtual wxString GetDesktopEnvironment() const;
#endif
+#if wxUSE_SOCKETS
+ virtual wxSocketManager *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_