fix memory leak; allocate the DC before SetFont() is called on the status bar

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

diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h
index 3b8168570c9e371224f7510e67b02287ee041454..4038e880941428eaf6444dc229cead68189790da 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:
+#if wxUSE_CONSOLE_EVENTLOOP
+    virtual wxEventLoopBase *CreateEventLoop();
+#endif // wxUSE_CONSOLE_EVENTLOOP
+#if wxUSE_TIMER
+    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
+#endif
 };
 
 #if wxUSE_GUI
@@ -26,7 +32,11 @@ 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
     // ----------------
@@ -39,8 +49,21 @@ public:
 #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_