wxGPE updates to HEAD.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -35,6 +35,7 @@
|
||||
#include "wx/dcclient.h"
|
||||
#include "wx/gtk/private.h"
|
||||
#include "wx/timer.h"
|
||||
#include "wx/settings.h"
|
||||
|
||||
#include <glib.h>
|
||||
#include <gdk/gdk.h>
|
||||
@@ -652,6 +653,17 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
|
||||
maxWidth = GetMaxWidth(),
|
||||
maxHeight = GetMaxHeight();
|
||||
|
||||
if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA)
|
||||
{
|
||||
// GPE's window manager doesn't like size hints
|
||||
// at all, esp. when the user has to use the
|
||||
// virtual keyboard.
|
||||
minWidth = -1;
|
||||
minHeight = -1;
|
||||
maxWidth = -1;
|
||||
maxHeight = -1;
|
||||
}
|
||||
|
||||
if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
|
||||
if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;
|
||||
if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth;
|
||||
@@ -733,6 +745,17 @@ void wxTopLevelWindowGTK::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
|
||||
maxWidth = GetMaxWidth(),
|
||||
maxHeight = GetMaxHeight();
|
||||
|
||||
if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA)
|
||||
{
|
||||
// GPE's window manager doesn't like size hints
|
||||
// at all, esp. when the user has to use the
|
||||
// virtual keyboard.
|
||||
minWidth = -1;
|
||||
minHeight = -1;
|
||||
maxWidth = -1;
|
||||
maxHeight = -1;
|
||||
}
|
||||
|
||||
if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
|
||||
if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;
|
||||
if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth;
|
||||
|
Reference in New Issue
Block a user