changed ds[pw] files to use CRLF eol style and not native one (this helps if you...

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

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index 6c96295e52ed2859de3ff7a8c25373c93274ec83..22deeec8c93a5a3ce92e28faffa68dd29c662ac5 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -16,10 +16,11 @@
 #define XtDisplay XTDISPLAY
 #endif
 
 #define XtDisplay XTDISPLAY
 #endif
 

-#include "wx/defs.h"
-

 #include "wx/statbox.h"
 #include "wx/statbox.h"

-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -92,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();
 


@@ -101,10 +104,9 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
             // XmNshadowType, XmSHADOW_IN,
             NULL);
 
             // XmNshadowType, XmSHADOW_IN,
             NULL);
 

-    bool hasLabel = (!label.IsNull() && !label.IsEmpty()) ;
-    if (hasLabel)
+    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 );
 


@@ -115,13 +117,13 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 #if wxCHECK_MOTIF_VERSION( 2, 0 )
                 XmNframeChildType, XmFRAME_TITLE_CHILD,
 #else
 #if wxCHECK_MOTIF_VERSION( 2, 0 )
                 XmNframeChildType, XmFRAME_TITLE_CHILD,
 #else

-                XmNchildType, XmFRAME_TITLE_CHILD,          
+                XmNchildType, XmFRAME_TITLE_CHILD,

 #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;
 }