LessTif 0.93 does not hang in wxWindow::ChangeFont as 0.87 did:

enable chainging window font again.
  Set/reset MappedWhenManaged flag when showing/hiding a window, otherwise,
since some common operations (moving, adding items to a listbox, ...) do
a Unmanage-Manage pair, calling Hide and then (for example) SetSize would
show the window again.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 15a5f5240f27849bdf9e49eafe277504bca4e0bf..accefb6a1a825435d3cc509561f86c45aec0f119 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -172,17 +172,24 @@ void wxWindow::UnmanageAndDestroy(WXWidget widget)
     }
 }
 
     }
 }
 

-bool wxWindow::MapOrUnmap(WXWidget widget, bool map)
+bool wxWindow::MapOrUnmap(WXWidget widget, bool domap)

 {
     Widget w = (Widget)widget;
     if ( !w )
         return FALSE;
 
 {
     Widget w = (Widget)widget;
     if ( !w )
         return FALSE;
 

-    if ( map )
+    if ( domap )

         XtMapWidget(w);
     else
         XtUnmapWidget(w);
 
         XtMapWidget(w);
     else
         XtUnmapWidget(w);
 

+    //   Rationale: a lot of common operations (including but not
+    // limited to moving, resizing and appending items to a listbox)
+    // unmamange the widget, do their work, then manage it again.
+    // This means that, for example adding an item to a listbox will show it,
+    // or that most controls are shown every time they are moved or resized!
+    XtSetMappedWhenManaged( w, domap );
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -2986,8 +2993,9 @@ void wxWindow::ChangeFont(bool keepOriginalSize)
         int width, height, width1, height1;
         GetSize(& width, & height);
 
         int width, height, width1, height1;
         GetSize(& width, & height);
 

-        // lesstif 0.87 hangs here
-#ifndef LESSTIF_VERSION
+        // lesstif 0.87 hangs here, but 0.93 does not
+#if !defined(LESSTIF_VERSION) \
+    || (defined(LesstifVersion) && LesstifVersion >= 93)

         XtVaSetValues (w,
             XmNfontList, (XmFontList) m_font.GetFontList(1.0, XtDisplay(w)),
             NULL);
         XtVaSetValues (w,
             XmNfontList, (XmFontList) m_font.GetFontList(1.0, XtDisplay(w)),
             NULL);