wxGTK1 : wx/private/eventloopsourcesmanager.h was missing in evtloop.cpp

[wxWidgets.git] / src / motif / app.cpp

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 0a073548e787f54b933a7c197e97d2be88003fd3..b785132058ba61f37db9f2527248333a616aff2f 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -68,7 +67,6 @@ wxHashTable *wxWidgetHashTable = NULL;
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
-#ifdef __WXDEBUG__
 extern "C"
 {
     typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
@@ -86,7 +84,6 @@ static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
 }
 
 }
-#endif // __WXDEBUG__
 
 bool wxApp::Initialize(int& argc_, wxChar **argv_)
 {
@@ -126,7 +123,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
                 strcmp(loc, "POSIX") == 0 )
     {
         // we're using C locale, "fix" it
-        wxLogDebug(_T("HP-UX fontset hack: forcing locale to en_US.iso88591"));
+        wxLogDebug(wxT("HP-UX fontset hack: forcing locale to en_US.iso88591"));
         putenv(fixAll ? "LC_ALL=en_US.iso88591" : "LC_CTYPE=en_US.iso88591");
     }
 #endif // __HPUX__
@@ -164,10 +161,10 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
     // immediate crash inside XOpenIM() (if XIM is used) under IRIX
     wxString appname = wxTheApp->GetAppName();
     if ( appname.empty() )
-        appname = _T("wxapp");
+        appname = wxT("wxapp");
     wxString clsname = wxTheApp->GetClassName();
     if ( clsname.empty() )
-        clsname = _T("wx");
+        clsname = wxT("wx");
 
     // FIXME-UTF8: This code is taken from wxGTK and duplicated here. This
     //             is just a temporary fix to make wxX11 compile in Unicode
@@ -251,10 +248,8 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
     }
     m_initialDisplay = (WXDisplay*) dpy;
 
-#ifdef __WXDEBUG__
     // install the X error handler
     gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler);
-#endif // __WXDEBUG__
 
     // Add general resize proc
     XtActionsRec rec;
@@ -273,8 +268,7 @@ void wxApp::CleanUp()
 {
     wxAppBase::CleanUp();
 
-    delete wxWidgetHashTable;
-    wxWidgetHashTable = NULL;
+    wxDELETE(wxWidgetHashTable);
 
     delete m_mainLoop;