make use of GPE feature
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
16bd311d28
commit
62be94e1b1
@ -35,6 +35,10 @@
|
||||
#include "wx/module.h"
|
||||
#include "wx/image.h"
|
||||
|
||||
#ifdef __WXGPE__
|
||||
#include <gpe/init.h>
|
||||
#endif
|
||||
|
||||
#ifdef __WXUNIVERSAL__
|
||||
#include "wx/univ/theme.h"
|
||||
#include "wx/univ/renderer.h"
|
||||
@ -582,7 +586,12 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
|
||||
argvGTK[argc] = NULL;
|
||||
|
||||
int argcGTK = argc;
|
||||
|
||||
#ifdef __WXGPE__
|
||||
gpe_application_init( &argcGTK, &argvGTK );
|
||||
#else
|
||||
gtk_init( &argcGTK, &argvGTK );
|
||||
#endif
|
||||
|
||||
if ( argcGTK != argc )
|
||||
{
|
||||
|
@ -653,16 +653,15 @@ 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;
|
||||
}
|
||||
#ifdef __WXGPE__
|
||||
// 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;
|
||||
#endif
|
||||
|
||||
if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
|
||||
if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;
|
||||
@ -745,16 +744,15 @@ 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;
|
||||
}
|
||||
#ifdef __WXGPE__
|
||||
// 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;
|
||||
#endif
|
||||
|
||||
if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
|
||||
if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;
|
||||
|
@ -35,6 +35,10 @@
|
||||
#include "wx/module.h"
|
||||
#include "wx/image.h"
|
||||
|
||||
#ifdef __WXGPE__
|
||||
#include <gpe/init.h>
|
||||
#endif
|
||||
|
||||
#ifdef __WXUNIVERSAL__
|
||||
#include "wx/univ/theme.h"
|
||||
#include "wx/univ/renderer.h"
|
||||
@ -582,7 +586,12 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
|
||||
argvGTK[argc] = NULL;
|
||||
|
||||
int argcGTK = argc;
|
||||
|
||||
#ifdef __WXGPE__
|
||||
gpe_application_init( &argcGTK, &argvGTK );
|
||||
#else
|
||||
gtk_init( &argcGTK, &argvGTK );
|
||||
#endif
|
||||
|
||||
if ( argcGTK != argc )
|
||||
{
|
||||
|
@ -653,16 +653,15 @@ 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;
|
||||
}
|
||||
#ifdef __WXGPE__
|
||||
// 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;
|
||||
#endif
|
||||
|
||||
if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
|
||||
if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;
|
||||
@ -745,16 +744,15 @@ 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;
|
||||
}
|
||||
#ifdef __WXGPE__
|
||||
// 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;
|
||||
#endif
|
||||
|
||||
if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
|
||||
if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;
|
||||
|
Loading…
Reference in New Issue
Block a user