reverted the change of r32940 which worked around a bug due to associating a dummy...

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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 3063917e6122e4a3e127698df2f855cfae5c9839..d21948303970187067c9404e35d1dfd3ea3ac995 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -629,7 +629,8 @@ void wxWindow::Lower()
 
 void wxWindow::SetLabel(const wxString& label)
 {
 
 void wxWindow::SetLabel(const wxString& label)
 {

-    XtVaSetValues((Widget)GetMainWidget(), XmNtitle, label.mb_str(), NULL);
+    XtVaSetValues((Widget)GetMainWidget(), XmNtitle,
+                  (const char*)label.mb_str(), NULL);

 }
 
 wxString wxWindow::GetLabel() const
 }
 
 wxString wxWindow::GetLabel() const


@@ -1171,7 +1172,7 @@ void wxWindow::DoGetSize(int *x, int *y) const
                        XmNwidth, &xx,
                        XmNheight, &yy,
                        NULL );
                        XmNwidth, &xx,
                        XmNheight, &yy,
                        NULL );

-    if(x) *x = widget ? xx : -1; 
+    if(x) *x = widget ? xx : -1;

     if(y) *y = widget ? yy : -1;
 }
 
     if(y) *y = widget ? yy : -1;
 }
 


@@ -1653,7 +1654,7 @@ void wxWindow::OnInternalIdle()
 {
     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)
 {
     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)

-    if (wxUpdateUIEvent::CanUpdate(this))
+    if (wxUpdateUIEvent::CanUpdate(this) && IsShown())

         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 


@@ -2623,14 +2624,14 @@ void wxGetTextExtent(const wxWindow* window, const wxString& str,
     {
         XRectangle ink, logical;
         WXFontSet fset = (WXFontSet) args[0].value;
     {
         XRectangle ink, logical;
         WXFontSet fset = (WXFontSet) args[0].value;

-    
+

         XmbTextExtents( (XFontSet)fset, str.c_str(), str.length(),
                         &ink, &logical);
 
         if( width ) *width = logical.width;
         if( height ) *height = logical.height;
         XmbTextExtents( (XFontSet)fset, str.c_str(), str.length(),
                         &ink, &logical);
 
         if( width ) *width = logical.width;
         if( height ) *height = logical.height;

-        if( ascent ) *ascent = -logical.y;    
-        if( descent ) *descent = logical.height + logical.y;    
+        if( ascent ) *ascent = -logical.y;
+        if( descent ) *descent = logical.height + logical.y;

     }
     else
     {
     }
     else
     {


@@ -2669,14 +2670,14 @@ void wxGetTextExtent(const wxWindow* window, const wxString& str,
     if (type == XmFONT_IS_FONTSET)
     {
         XRectangle ink, logical;
     if (type == XmFONT_IS_FONTSET)
     {
         XRectangle ink, logical;

-    
+

         XmbTextExtents( (XFontSet)thing, str.c_str(), str.length(),
                         &ink, &logical);
 
         if( width ) *width = logical.width;
         if( height ) *height = logical.height;
         XmbTextExtents( (XFontSet)thing, str.c_str(), str.length(),
                         &ink, &logical);
 
         if( width ) *width = logical.width;
         if( height ) *height = logical.height;

-        if( ascent ) *ascent = -logical.y;    
-        if( descent ) *descent = logical.height + logical.y;    
+        if( ascent ) *ascent = -logical.y;
+        if( descent ) *descent = logical.height + logical.y;

     }
     else
     {
     }
     else
     {