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 cfd7acce888b43927489382d7394b1e377b74c41..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
 };
 


@@ -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 wxSocketManager *GetSocketManager();

 #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_