X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da494b405d0826b343ea6d249bbac27061e11d3e..e2a5251d0109a1be6b9ce5c818d89f56ebfaeae1:/src/motif/stattext.cpp?ds=sidebyside diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp index 4a8e765be4..ead5cd99b5 100644 --- a/src/motif/stattext.cpp +++ b/src/motif/stattext.cpp @@ -58,10 +58,6 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id, m_windowStyle = style; m_font = parent->GetFont(); -#if 0 // gcc 2.95 doesn't like this apparently - char* label1 = (label.IsNull() ? "" : (char*) (const char*) label); -#endif - Widget parentWidget = (Widget) parent->GetClientWidget(); Widget borderWidget = NULL; @@ -108,7 +104,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id, WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget)); - m_labelWidget = XtVaCreateManagedWidget ((char*) (const char*) name, + m_labelWidget = XtVaCreateManagedWidget (wxConstCast(name.c_str(), char), xmLabelWidgetClass, borderWidget ? borderWidget : parentWidget, wxFont::GetFontTag(), fontType,