Some Motif fixes; makefile fixes; added wxTransferStreamToFile/FileToStream for wxWin

streams; fixed wxSP_... ids that clashed with wxTextCtrl; added generic GetPixel implementation for GTK/Motif


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-02-24 15:04:24 +00:00
parent 07eb77a690
commit dc1efb1d9f
35 changed files with 643 additions and 53 deletions

View File

@@ -60,8 +60,9 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
XmString text = XmStringCreateSimple (label1);
#endif
wxString label1(wxStripMenuCodes(label));
wxXmString text( label );
wxXmString text( label1 );
Widget parentWidget = (Widget) parent->GetClientWidget();
XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));