Rework wxMotif font/color inheritance so it works
like in the other ports. Avoid setting foreground/background color for windows and let the toolkit use the natural color. As an intermediate step font is still explicitly set. Handle the cases where m_foregroundColour, m_backgroundColour ir m_font are not initialized. Set default (overridable) X resources to emulate the old look. Unify wxMOTIF_NEW_FONT_HANDLING with wxMOTIF_USE_RENDER_TABLE. Minor unrelated (sizing) fixes to wxCheckListBox, wxStaticText, wxTextCtrl. Tagged with MOTIF_BEFORE_COLOUR_FONT_INHERITANCE before the changes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user