Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix default size of un-resizable windows, broken in r74685

Browse Source 
see #14870
closes #15549


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-10-05 16:20:06 +00:00
parent 42b2ebfdbb
commit a599b4b5d7
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gtk/toplevel.cpp
View File

@@ -744,17 +744,25 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
} }
} }
if ((style & wxRESIZE_BORDER) == 0)
gtk_window_set_resizable(GTK_WINDOW(m_widget), false);
#ifndef __WXGTK3__
else
gtk_window_set_policy(GTK_WINDOW(m_widget), 1, 1, 1);
#endif
m_decorSize = GetCachedDecorSize(); m_decorSize = GetCachedDecorSize();
int w, h; int w, h;
GTKDoGetSize(&w, &h); GTKDoGetSize(&w, &h);
gtk_window_set_default_size(GTK_WINDOW(m_widget), w, h);
if (style & wxRESIZE_BORDER)
{
gtk_window_set_default_size(GTK_WINDOW(m_widget), w, h);
#ifndef __WXGTK3__
gtk_window_set_policy(GTK_WINDOW(m_widget), 1, 1, 1);
#endif
}
else
{
gtk_window_set_resizable(GTK_WINDOW(m_widget), false);
// gtk_window_set_default_size() does not work for un-resizable windows,
// unless you set the size hints, but that causes Ubuntu's WM to make
// the window resizable even though GDK_FUNC_RESIZE is not set.
gtk_widget_set_size_request(m_widget, w, h);
}
return true; return true;
} }
@@ -1120,6 +1128,8 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
int w, h; int w, h;
GTKDoGetSize(&w, &h); GTKDoGetSize(&w, &h);
gtk_window_resize(GTK_WINDOW(m_widget), w, h); gtk_window_resize(GTK_WINDOW(m_widget), w, h);
if (!gtk_window_get_resizable(GTK_WINDOW(m_widget)))
gtk_widget_set_size_request(GTK_WIDGET(m_widget), w, h);
DoGetClientSize(&m_clientWidth, &m_clientHeight); DoGetClientSize(&m_clientWidth, &m_clientHeight);
wxSizeEvent event(GetSize(), GetId()); wxSizeEvent event(GetSize(), GetId());
@@ -1233,6 +1243,8 @@ void wxTopLevelWindowGTK::GTKUpdateDecorSize(const DecorSize& decorSize)
h >= m_minHeight - (decorSize.top + decorSize.bottom)) h >= m_minHeight - (decorSize.top + decorSize.bottom))
{ {
gtk_window_resize(GTK_WINDOW(m_widget), w, h); gtk_window_resize(GTK_WINDOW(m_widget), w, h);
if (!gtk_window_get_resizable(GTK_WINDOW(m_widget)))
gtk_widget_set_size_request(GTK_WIDGET(m_widget), w, h);
resized = true; resized = true;
} }
} }