X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2158f4d798650d7f8cc59ba36e115679b0effe1b..79b7b95aed76eb742deef93d046886c20452fb36:/src/motif/dialog.cpp diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp index dceb887490..95abbae57c 100644 --- a/src/motif/dialog.cpp +++ b/src/motif/dialog.cpp @@ -75,7 +75,6 @@ wxDialog::wxDialog() { m_modalShowing = false; m_eventLoop = NULL; - m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); } bool wxDialog::Create(wxWindow *parent, wxWindowID id, @@ -94,16 +93,10 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, m_modalShowing = false; m_eventLoop = NULL; - m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - m_foregroundColour = *wxBLACK; - Widget dialogShell = (Widget) m_mainWidget; SetTitle( title ); - m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - ChangeFont(false); - // Can't remember what this was about... but I think it's necessary. #if wxUSE_INVISIBLE_RESIZE if (pos.x > -1) @@ -135,7 +128,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, XtAddEventHandler(dialogShell,ExposureMask,False, wxUniversalRepaintProc, (XtPointer) this); - ChangeBackgroundColour(); + PostCreation(); return true; } @@ -162,7 +155,7 @@ bool wxDialog::XmDoCreateTLW(wxWindow* parent, XtSetArg (args[1], XmNautoUnmanage, False); Widget dialogShell = XmCreateBulletinBoardDialog( parentWidget, - wxConstCast(name.c_str(), char), + name.char_str(), args, 2); m_mainWidget = (WXWidget) dialogShell; @@ -243,9 +236,9 @@ void wxDialog::SetTitle(const wxString& title) { wxXmString str( title ); XtVaSetValues( (Widget)m_mainWidget, - XmNtitle, title.c_str(), - XmNdialogTitle, str(), // Roberto Cocchi - XmNiconName, title.c_str(), + XmNtitle, (const char*)title.mb_str(), + XmNdialogTitle, str(), + XmNiconName, (const char*)title.mb_str(), NULL ); } }