don't overwrite the existing local file if we failed to open it but it does exist

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

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index f6d4fa2b5e1531efadaa1370446cd91b2127de15..22deeec8c93a5a3ce92e28faffa68dd29c662ac5 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -93,6 +93,8 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
     if( !CreateControl( parent, id, pos, size, style,
                         wxDefaultValidator, name ) )
         return false;
     if( !CreateControl( parent, id, pos, size, style,
                         wxDefaultValidator, name ) )
         return false;

+    m_labelWidget = (WXWidget) 0;
+    PreCreation();

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 


@@ -104,7 +106,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 
     if (!label.empty())
     {
 
     if (!label.empty())
     {

-        wxString label1(wxStripMenuCodes(label));
+        wxString label1(GetLabelText(label));

         wxXmString text(label1);
         Display* dpy = XtDisplay( parentWidget );
 
         wxXmString text(label1);
         Display* dpy = XtDisplay( parentWidget );
 


@@ -119,9 +121,9 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 #endif
                 NULL);
     }
 #endif
                 NULL);
     }

-
+    
+    PostCreation();

     AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
     AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);

-    ChangeBackgroundColour();

 
     return true;
 }
 
     return true;
 }