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

Move code that does not need realized GdkWinow out of realize handler

Browse Source 
These calls can be made much earlier, and it seems like a good idea to do so.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2013-08-18 15:01:06 +00:00
parent 60435227b1
commit dca2fe5dae
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/toplevel.cpp
View File

@ -353,14 +353,6 @@ void wxTopLevelWindowGTK::GTKHandleRealized()
gdk_window_set_functions(gtk_widget_get_window(m_widget), gdk_window_set_functions(gtk_widget_get_window(m_widget),
(GdkWMFunction)m_gdkFunc); (GdkWMFunction)m_gdkFunc);
// GTK's shrinking/growing policy
if ( !(m_gdkFunc & GDK_FUNC_RESIZE) )
gtk_window_set_resizable(GTK_WINDOW(m_widget), FALSE);
#ifndef __WXGTK3__
else
gtk_window_set_policy(GTK_WINDOW(m_widget), 1, 1, 1);
#endif
const wxIconBundle& icons = GetIcons(); const wxIconBundle& icons = GetIcons();
if (icons.GetIconCount()) if (icons.GetIconCount())
SetIcons(icons); SetIcons(icons);
@ -754,6 +746,13 @@ 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
// GTK sometimes chooses very small size if max size hint is not explicitly set // GTK sometimes chooses very small size if max size hint is not explicitly set
DoSetSizeHints(m_minWidth, m_minHeight, m_maxWidth, m_maxHeight, m_incWidth, m_incHeight); DoSetSizeHints(m_minWidth, m_minHeight, m_maxWidth, m_maxHeight, m_incWidth, m_incHeight);