Fixes for gcc 2.95 and AIX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -52,19 +52,25 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
|
||||
else
|
||||
m_windowId = id;
|
||||
|
||||
#if 0 // gcc 2.95 doesn't like this apparently
|
||||
char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
|
||||
|
||||
XmString text = XmStringCreateSimple (label1);
|
||||
#endif
|
||||
|
||||
wxXmString text( label );
|
||||
|
||||
Widget parentWidget = (Widget) parent->GetClientWidget();
|
||||
XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
|
||||
|
||||
m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
|
||||
xmToggleButtonWidgetClass, parentWidget,
|
||||
XmNfontList, fontList,
|
||||
XmNlabelString, text,
|
||||
XmNlabelString, text(),
|
||||
NULL);
|
||||
#if 0
|
||||
XmStringFree (text);
|
||||
|
||||
#endif
|
||||
|
||||
XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,
|
||||
(XtPointer) this);
|
||||
|
||||
|
Reference in New Issue
Block a user