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

make use of GPE feature

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-02-28 13:18:08 +00:00
parent 16bd311d28
commit 62be94e1b1
4 changed files with 54 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/app.cpp
View File

@@ -35,6 +35,10 @@
#include "wx/module.h" #include "wx/module.h"
#include "wx/image.h" #include "wx/image.h"
#ifdef __WXGPE__
#include <gpe/init.h>
#endif
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
#include "wx/univ/theme.h" #include "wx/univ/theme.h"
#include "wx/univ/renderer.h" #include "wx/univ/renderer.h"
@@ -582,7 +586,12 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
argvGTK[argc] = NULL; argvGTK[argc] = NULL;
int argcGTK = argc; int argcGTK = argc;
#ifdef __WXGPE__
gpe_application_init( &argcGTK, &argvGTK );
#else
gtk_init( &argcGTK, &argvGTK ); gtk_init( &argcGTK, &argvGTK );
#endif
if ( argcGTK != argc ) if ( argcGTK != argc )
{ {

10
src/gtk/toplevel.cpp
View File

@@ -653,8 +653,7 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
maxWidth = GetMaxWidth(), maxWidth = GetMaxWidth(),
maxHeight = GetMaxHeight(); maxHeight = GetMaxHeight();
if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA) #ifdef __WXGPE__
{
// GPE's window manager doesn't like size hints // GPE's window manager doesn't like size hints
// at all, esp. when the user has to use the // at all, esp. when the user has to use the
// virtual keyboard. // virtual keyboard.
@@ -662,7 +661,7 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
minHeight = -1; minHeight = -1;
maxWidth = -1; maxWidth = -1;
maxHeight = -1; maxHeight = -1;
} #endif
if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth; if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight; if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;
@@ -745,8 +744,7 @@ void wxTopLevelWindowGTK::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
maxWidth = GetMaxWidth(), maxWidth = GetMaxWidth(),
maxHeight = GetMaxHeight(); maxHeight = GetMaxHeight();
if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA) #ifdef __WXGPE__
{
// GPE's window manager doesn't like size hints // GPE's window manager doesn't like size hints
// at all, esp. when the user has to use the // at all, esp. when the user has to use the
// virtual keyboard. // virtual keyboard.
@@ -754,7 +752,7 @@ void wxTopLevelWindowGTK::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
minHeight = -1; minHeight = -1;
maxWidth = -1; maxWidth = -1;
maxHeight = -1; maxHeight = -1;
} #endif
if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth; if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight; if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;

9
src/gtk1/app.cpp
View File

@@ -35,6 +35,10 @@
#include "wx/module.h" #include "wx/module.h"
#include "wx/image.h" #include "wx/image.h"
#ifdef __WXGPE__
#include <gpe/init.h>
#endif
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
#include "wx/univ/theme.h" #include "wx/univ/theme.h"
#include "wx/univ/renderer.h" #include "wx/univ/renderer.h"
@@ -582,7 +586,12 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
argvGTK[argc] = NULL; argvGTK[argc] = NULL;
int argcGTK = argc; int argcGTK = argc;
#ifdef __WXGPE__
gpe_application_init( &argcGTK, &argvGTK );
#else
gtk_init( &argcGTK, &argvGTK ); gtk_init( &argcGTK, &argvGTK );
#endif
if ( argcGTK != argc ) if ( argcGTK != argc )
{ {

10
src/gtk1/toplevel.cpp
View File

@@ -653,8 +653,7 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
maxWidth = GetMaxWidth(), maxWidth = GetMaxWidth(),
maxHeight = GetMaxHeight(); maxHeight = GetMaxHeight();
if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA) #ifdef __WXGPE__
{
// GPE's window manager doesn't like size hints // GPE's window manager doesn't like size hints
// at all, esp. when the user has to use the // at all, esp. when the user has to use the
// virtual keyboard. // virtual keyboard.
@@ -662,7 +661,7 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
minHeight = -1; minHeight = -1;
maxWidth = -1; maxWidth = -1;
maxHeight = -1; maxHeight = -1;
} #endif
if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth; if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight; if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;
@@ -745,8 +744,7 @@ void wxTopLevelWindowGTK::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
maxWidth = GetMaxWidth(), maxWidth = GetMaxWidth(),
maxHeight = GetMaxHeight(); maxHeight = GetMaxHeight();
if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA) #ifdef __WXGPE__
{
// GPE's window manager doesn't like size hints // GPE's window manager doesn't like size hints
// at all, esp. when the user has to use the // at all, esp. when the user has to use the
// virtual keyboard. // virtual keyboard.
@@ -754,7 +752,7 @@ void wxTopLevelWindowGTK::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
minHeight = -1; minHeight = -1;
maxWidth = -1; maxWidth = -1;
maxHeight = -1; maxHeight = -1;
} #endif
if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth; if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight; if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;