Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index f6d4fa2b5e1531efadaa1370446cd91b2127de15..2ea22aee4dc3cb3c0d1902ac93d188a7d06dfaff 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-

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


@@ -33,8 +29,6 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-

 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
 //EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
 //EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
 END_EVENT_TABLE()


@@ -93,6 +87,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 +100,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 );
 


@@ -120,8 +116,8 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
                 NULL);
     }
 
                 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;
 }