Initialize wxTopLevelWindow::DecorSize in wxGTK

Add default ctor for this struct as it was too easy to forget to
initialize it otherwise, ending up with bogus values in it, as it
happened with wxTLWGeometry::m_decorSize, which resulted in a failure in
wxPersistTLW unit test and, probably, real code too.
This commit is contained in:
Vadim Zeitlin
2019-07-15 21:41:27 +02:00
parent f9f58cca54
commit 8cdd20667f
3 changed files with 8 additions and 2 deletions

View File

@@ -112,6 +112,14 @@ public:
// size of WM decorations
struct DecorSize
{
DecorSize()
{
left =
right =
top =
bottom = 0;
}
int left, right, top, bottom;
};
DecorSize m_decorSize;

View File

@@ -307,7 +307,6 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
if (style & wxRESIZE_BORDER)
m_gdkFunc |= GDK_FUNC_RESIZE;
gtk_window_set_default_size(GTK_WINDOW(m_widget), m_width, m_height);
memset(&m_decorSize, 0, sizeof(m_decorSize));
m_deferShow = false;
if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)))

View File

@@ -565,7 +565,6 @@ void wxTopLevelWindowGTK::Init()
m_updateDecorSize = true;
m_netFrameExtentsTimerId = 0;
m_incWidth = m_incHeight = 0;
memset(&m_decorSize, 0, sizeof(m_decorSize));
m_urgency_hint = -2;
}