Fix incorrect comparison

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 3cf1ef5e64a54a17badda39a60dd49e8f026323f..4fa8fbcc8fb0043433150e09d1149989e5c8a9ff 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.cpp
+// Name:        src/motif/app.cpp

 // Purpose:     wxApp
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxApp
 // Author:      Julian Smart
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "app.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -22,20 +18,24 @@
 #endif
 
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"

-#include "wx/utils.h"
-#include "wx/module.h"
-#include "wx/memory.h"
-#include "wx/log.h"
-#include "wx/intl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/hash.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/memory.h"
+    #include "wx/font.h"
+#endif
+

 #include "wx/evtloop.h"
 #include "wx/evtloop.h"

-#include "wx/hash.h"

 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 #endif
 
 #ifdef __VMS__
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 #endif
 
 #ifdef __VMS__

-#pragma message disable nosimpint
+    #pragma message disable nosimpint

 #endif
 #include <Xm/Xm.h>
 #include <X11/Xlib.h>
 #endif
 #include <Xm/Xm.h>
 #include <X11/Xlib.h>


@@ -43,7 +43,7 @@
 #include <X11/Xresource.h>
 #include <X11/Xatom.h>
 #ifdef __VMS__
 #include <X11/Xresource.h>
 #include <X11/Xatom.h>
 #ifdef __VMS__

-#pragma message enable nosimpint
+    #pragma message enable nosimpint

 #endif
 
 #include "wx/motif/private.h"
 #endif
 
 #include "wx/motif/private.h"


@@ -53,17 +53,20 @@
 struct wxPerDisplayData
 {
     wxPerDisplayData()
 struct wxPerDisplayData
 {
     wxPerDisplayData()

-        { m_visualInfo = NULL; m_topLevelWidget = NULL; }
+    {
+        m_visualInfo = NULL;
+        m_topLevelWidget = NULL;
+        m_topLevelRealizedWidget = NULL;
+    }

 
     wxXVisualInfo* m_visualInfo;
 
     wxXVisualInfo* m_visualInfo;

-    Widget         m_topLevelWidget;
+    Widget         m_topLevelWidget, m_topLevelRealizedWidget;

 };
 
 static void wxTLWidgetDestroyCallback(Widget w, XtPointer clientData,
                                       XtPointer ptr);
 static WXWidget wxCreateTopLevelWidget( WXDisplay* display );
 
 };
 
 static void wxTLWidgetDestroyCallback(Widget w, XtPointer clientData,
                                       XtPointer ptr);
 static WXWidget wxCreateTopLevelWidget( WXDisplay* display );
 

-extern wxList wxPendingDelete;

 extern bool wxAddIdleCallback();
 
 wxHashTable *wxWidgetHashTable = NULL;
 extern bool wxAddIdleCallback();
 
 wxHashTable *wxWidgetHashTable = NULL;


@@ -75,33 +78,62 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
 END_EVENT_TABLE()
 
 #ifdef __WXDEBUG__
 END_EVENT_TABLE()
 
 #ifdef __WXDEBUG__

+extern "C"
+{

     typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
     typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);

+}

 
 

-    XErrorHandlerFunc gs_pfnXErrorHandler = 0;
+XErrorHandlerFunc gs_pfnXErrorHandler = 0;

 
 

-    static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
-    {
-        // just forward to the default handler for now
-        return gs_pfnXErrorHandler(dpy, xevent);
-    }
+extern "C"
+{
+
+static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
+{
+    // just forward to the default handler for now
+    return gs_pfnXErrorHandler(dpy, xevent);
+}
+
+}

 #endif // __WXDEBUG__
 
 #endif // __WXDEBUG__
 

-bool wxApp::Initialize(int& argc, wxChar **argv)
+bool wxApp::Initialize(int& argcOrig, wxChar **argvOrig)

 {
 {

-    if ( !wxAppBase::Initialize(argc, argv) )
+    if ( !wxAppBase::Initialize(argcOrig, argvOrig) )

         return false;
 
     wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
 
         return false;
 
     wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
 

+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
+

     return true;
 }
 
 void wxApp::CleanUp()
 {
     return true;
 }
 
 void wxApp::CleanUp()
 {

+    wxAppBase::CleanUp();
+

     delete wxWidgetHashTable;
     wxWidgetHashTable = NULL;
 
     delete wxWidgetHashTable;
     wxWidgetHashTable = NULL;
 

-    wxAppBase::CleanUp();
+    delete m_mainLoop;
+
+    for( wxPerDisplayDataMap::iterator it  = m_perDisplayData->begin(),
+                                       end = m_perDisplayData->end();
+         it != end; ++it )
+    {
+        delete it->second->m_visualInfo;
+        // On Solaris 10 calling XtDestroyWidget on the top level widget
+        // dumps core if the locale is set to something other than "C"
+#ifndef __SUN__
+        XtDestroyWidget( it->second->m_topLevelWidget );
+#endif
+        delete it->second;
+    }
+
+    delete m_perDisplayData;

 }
 
 void wxApp::Exit()
 }
 
 void wxApp::Exit()


@@ -129,19 +161,6 @@ wxApp::wxApp()
 
 wxApp::~wxApp()
 {
 
 wxApp::~wxApp()
 {

-    delete m_mainLoop;
-
-    for( wxPerDisplayDataMap::iterator it  = m_perDisplayData->begin(),
-                                       end = m_perDisplayData->end();
-         it != end; ++it )
-    {
-        delete it->second->m_visualInfo;
-        XtDestroyWidget( it->second->m_topLevelWidget );
-        delete it->second;
-    }
-
-    delete m_perDisplayData;
-

     wxApp::SetInstance(NULL);
 }
 
     wxApp::SetInstance(NULL);
 }
 


@@ -172,10 +191,19 @@ void wxApp::HandlePropertyChange(WXEvent *event)
 }
 
 static char *fallbackResources[] = {
 }
 
 static char *fallbackResources[] = {

-    "*menuBar.marginHeight: 0",
-    "*menuBar.shadowThickness: 1",
-    "*background: #c0c0c0",
-    "*foreground: black",
+    // better defaults for CDE under Irix
+    //
+    // TODO: do something similar for the other systems, the hardcoded defaults
+    //       below are ugly
+#ifdef __SGI__
+    wxMOTIF_STR("*sgiMode: True"),
+    wxMOTIF_STR("*useSchemes: all"),
+#else // !__SGI__
+    wxMOTIF_STR("*menuBar.marginHeight: 0"),
+    wxMOTIF_STR("*menuBar.shadowThickness: 1"),
+    wxMOTIF_STR("*background: #c0c0c0"),
+    wxMOTIF_STR("*foreground: black"),
+#endif // __SGI__/!__SGI__

     NULL
 };
 
     NULL
 };
 


@@ -183,14 +211,59 @@ static char *fallbackResources[] = {
 bool wxApp::OnInitGui()
 {
     if( !wxAppBase::OnInitGui() )
 bool wxApp::OnInitGui()
 {
     if( !wxAppBase::OnInitGui() )

-        return FALSE;
+        return false;

 
 

+#ifdef __HPUX__
+    // under HP-UX creating XmFontSet fails when the system locale is C and
+    // we're using a remote DISPLAY, presumably because HP-UX uses its own
+    // names for C and ISO locales (roman8 and iso8859n respectively) and so
+    // its Motif libraries have troubles with non-HP X server
+    //
+    // whatever the reason, the fact is that without this hack any wxMotif
+    // program crashes on startup because it can't create any font (HP programs
+    // still work but they do spit out messages about failing to create font
+    // sets and failing back on "fixed" font too)
+    //
+    // notice that calling setlocale() here is not enough because X(m) init
+    // functions call setlocale() later so we really have to change environment
+    bool fixAll = false; // tweak LC_ALL (or just LC_CTYPE)?
+    const char *loc = getenv("LC_CTYPE");
+    if ( !loc )
+    {
+        loc = getenv("LC_ALL");
+        if ( loc )
+            fixAll = true;
+    }
+
+    if ( !loc ||
+            (loc[0] == 'C' && loc[1] == '\0') ||
+                strcmp(loc, "POSIX") == 0 )
+    {
+        // we're using C locale, "fix" it
+        wxLogDebug(_T("HP-UX fontset hack: forcing locale to en_US.iso88591"));
+        putenv(fixAll ? "LC_ALL=en_US.iso88591" : "LC_CTYPE=en_US.iso88591");
+    }
+#endif // __HPUX__
+
+    XtSetLanguageProc(NULL, NULL, NULL);

     XtToolkitInitialize() ;
     wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext();
     XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources);
 
     XtToolkitInitialize() ;
     wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext();
     XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources);
 

-    Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
-        wxTheApp->GetClassName().c_str(), NULL, 0,
+    // we shouldn't pass empty application/class name as it results in
+    // immediate crash inside XOpenIM() (if XIM is used) under IRIX
+    wxString appname = wxTheApp->GetAppName();
+    if ( appname.empty() )
+        appname = _T("wxapp");
+    wxString clsname = wxTheApp->GetClassName();
+    if ( clsname.empty() )
+        clsname = _T("wx");
+
+    Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,
+        (String)NULL,
+        appname.c_str(),
+        clsname.c_str(),
+        NULL, 0,    // no options

 # if XtSpecificationRelease < 5
         (Cardinal*) &argc,
 # else
 # if XtSpecificationRelease < 5
         (Cardinal*) &argc,
 # else


@@ -202,7 +275,7 @@ bool wxApp::OnInitGui()
          // if you don't log to stderr, nothing will be shown...
         delete wxLog::SetActiveTarget(new wxLogStderr);
         wxString className(wxTheApp->GetClassName());
          // if you don't log to stderr, nothing will be shown...
         delete wxLog::SetActiveTarget(new wxLogStderr);
         wxString className(wxTheApp->GetClassName());

-        wxLogError(_("wxWindows could not open display for '%s': exiting."),
+        wxLogError(_("wxWidgets could not open display for '%s': exiting."),

                    className.c_str());
         exit(-1);
     }
                    className.c_str());
         exit(-1);
     }


@@ -215,7 +288,7 @@ bool wxApp::OnInitGui()
 
     // Add general resize proc
     XtActionsRec rec;
 
     // Add general resize proc
     XtActionsRec rec;

-    rec.string = "resize";
+    rec.string = wxMOTIF_STR("resize");

     rec.proc = (XtActionProc)wxWidgetResizeProc;
     XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1);
 
     rec.proc = (XtActionProc)wxWidgetResizeProc;
     XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1);
 


@@ -223,7 +296,7 @@ bool wxApp::OnInitGui()
 
     wxAddIdleCallback();
 
 
     wxAddIdleCallback();
 

-    return TRUE;
+    return true;

 }
 
 WXColormap wxApp::GetMainColormap(WXDisplay* display)
 }
 
 WXColormap wxApp::GetMainColormap(WXDisplay* display)


@@ -270,12 +343,16 @@ wxXVisualInfo* wxApp::GetVisualInfo( WXDisplay* display )
     return vi;
 }
 
     return vi;
 }
 

-static void wxTLWidgetDestroyCallback(Widget w, XtPointer clientData,
-                                      XtPointer ptr)
+static void wxTLWidgetDestroyCallback(Widget w, XtPointer WXUNUSED(clientData),
+                                      XtPointer WXUNUSED(ptr))

 {
     if( wxTheApp )
 {
     if( wxTheApp )

+    {

         wxTheApp->SetTopLevelWidget( (WXDisplay*)XtDisplay(w),
                                      (WXWidget)NULL );
         wxTheApp->SetTopLevelWidget( (WXDisplay*)XtDisplay(w),
                                      (WXWidget)NULL );

+        wxTheApp->SetTopLevelRealizedWidget( (WXDisplay*)XtDisplay(w),
+                                             (WXWidget)NULL );
+    }

 }
 
 WXWidget wxCreateTopLevelWidget( WXDisplay* display )
 }
 
 WXWidget wxCreateTopLevelWidget( WXDisplay* display )


@@ -285,8 +362,9 @@ WXWidget wxCreateTopLevelWidget( WXDisplay* display )
                                    applicationShellWidgetClass,
                                    (Display*)display,
                                    NULL, 0 );
                                    applicationShellWidgetClass,
                                    (Display*)display,
                                    NULL, 0 );

-    XtSetMappedWhenManaged( tlw, False );
-    XtRealizeWidget( tlw );
+    XtVaSetValues( tlw,
+                   XmNoverrideRedirect, True,
+                   NULL );

 
     XtAddCallback( tlw, XmNdestroyCallback,
                    (XtCallbackProc)wxTLWidgetDestroyCallback,
 
     XtAddCallback( tlw, XmNdestroyCallback,
                    (XtCallbackProc)wxTLWidgetDestroyCallback,


@@ -295,6 +373,17 @@ WXWidget wxCreateTopLevelWidget( WXDisplay* display )
     return (WXWidget)tlw;
 }
 
     return (WXWidget)tlw;
 }
 

+WXWidget wxCreateTopLevelRealizedWidget( WXDisplay* WXUNUSED(display) )
+{
+    Widget rTlw = XtVaCreateWidget( "dummy_widget", topLevelShellWidgetClass,
+                                    (Widget)wxTheApp->GetTopLevelWidget(),
+                                     NULL );
+    XtSetMappedWhenManaged( rTlw, False );
+    XtRealizeWidget( rTlw );
+
+    return (WXWidget)rTlw;
+}
+

 WXWidget wxApp::GetTopLevelWidget()
 {
     WXDisplay* display = wxGetDisplay();
 WXWidget wxApp::GetTopLevelWidget()
 {
     WXDisplay* display = wxGetDisplay();


@@ -309,16 +398,37 @@ WXWidget wxApp::GetTopLevelWidget()
     return tlw;
 }
 
     return tlw;
 }
 

+WXWidget wxApp::GetTopLevelRealizedWidget()
+{
+    WXDisplay* display = wxGetDisplay();
+    wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display );
+
+    if( it != m_perDisplayData->end() && it->second->m_topLevelRealizedWidget )
+        return (WXWidget)it->second->m_topLevelRealizedWidget;
+
+    WXWidget rTlw = wxCreateTopLevelRealizedWidget( display );
+    SetTopLevelRealizedWidget( display, rTlw );
+
+    return rTlw;
+}
+

 void wxApp::SetTopLevelWidget(WXDisplay* display, WXWidget widget)
 {
 void wxApp::SetTopLevelWidget(WXDisplay* display, WXWidget widget)
 {

-    (*m_perDisplayData)[display]->m_topLevelWidget = (Widget)widget;
+    GetOrCreatePerDisplayData( *m_perDisplayData, display )
+        .m_topLevelWidget = (Widget)widget;
+}
+
+void wxApp::SetTopLevelRealizedWidget(WXDisplay* display, WXWidget widget)
+{
+    GetOrCreatePerDisplayData( *m_perDisplayData, display )
+        .m_topLevelRealizedWidget = (Widget)widget;

 }
 
 // Yield to other processes
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {
 }
 
 // Yield to other processes
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {

-    static bool s_inYield = FALSE;
+    static bool s_inYield = false;

 
     if ( s_inYield )
     {
 
     if ( s_inYield )
     {


@@ -327,17 +437,17 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    s_inYield = TRUE;
+    s_inYield = true;

 
     while (wxTheApp && wxTheApp->Pending())
         wxTheApp->Dispatch();
 
 
     while (wxTheApp && wxTheApp->Pending())
         wxTheApp->Dispatch();
 

-    s_inYield = FALSE;
+    s_inYield = false;

 
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------