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:
@@ -130,11 +130,6 @@ bool wxFrame::Create(wxWindow *parent,
|
||||
name ) )
|
||||
return false;
|
||||
|
||||
m_backgroundColour =
|
||||
wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
|
||||
m_foregroundColour = *wxBLACK;
|
||||
m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
|
||||
|
||||
int x = pos.x, y = pos.y;
|
||||
int width = size.x, height = size.y;
|
||||
|
||||
@@ -180,10 +175,7 @@ bool wxFrame::Create(wxWindow *parent,
|
||||
if (height > -1)
|
||||
XtVaSetValues((Widget) m_frameShell, XmNheight, height, NULL);
|
||||
|
||||
ChangeFont(false);
|
||||
|
||||
ChangeBackgroundColour();
|
||||
|
||||
PostCreation();
|
||||
PreResize();
|
||||
|
||||
wxSize newSize(width, height);
|
||||
@@ -398,6 +390,12 @@ void wxFrame::DoSetClientSize(int width, int height)
|
||||
|
||||
void wxFrame::DoGetSize(int *width, int *height) const
|
||||
{
|
||||
if (!m_frameShell)
|
||||
{
|
||||
*width = -1; *height = -1;
|
||||
return;
|
||||
}
|
||||
|
||||
Dimension xx, yy;
|
||||
XtVaGetValues((Widget) m_frameShell, XmNwidth, &xx, XmNheight, &yy, NULL);
|
||||
*width = xx; *height = yy;
|
||||
|
Reference in New Issue
Block a user