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

Global platform header (<PalmOS.h>) removed from public wx-headers (but included in wxprec.h) with all consequences in wxPalmOS specific API.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-07-01 19:36:58 +00:00
parent 6c99cd3d8c
commit 20bc5ad8dd
33 changed files with 183 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/defs.h
View File

@@ -653,6 +653,10 @@ enum { wxDefaultCoord = -1 };
/* define fixed length types */
/* ---------------------------------------------------------------------------- */
#if defined(__WXPALMOS__) || defined(__MINGW32__)
#include <sys/types.h>
#endif
/* chars are always one byte (by definition), shorts are always two (in */
/* practice) */
@@ -952,7 +956,6 @@ inline void *wxUIntToPtr(wxUIntPtr p)
/* Make sure ssize_t is defined (a signed type the same size as size_t) */
/* HAVE_SSIZE_T should be defined for compiliers that already have it */
#ifdef __MINGW32__
#include <sys/types.h>
#if defined(_SSIZE_T_) && !defined(HAVE_SSIZE_T)
#define HAVE_SSIZE_T
#endif
@@ -2452,6 +2455,7 @@ typedef WX_NSView WXWidget; /* wxWidgets BASE definition */
#if defined(__WXPALMOS__)
typedef void * WXHWND;
typedef void * WXHANDLE;
typedef void * WXHICON;
typedef void * WXHFONT;
@@ -2474,9 +2478,13 @@ typedef unsigned short WXWORD;
typedef unsigned long WXCOLORREF;
typedef struct tagMSG WXMSG;
typedef WinHandle WXWINHANDLE;
typedef WXHWND WXWINHANDLE; /* WinHandle of PalmOS */
typedef WXWINHANDLE WXWidget;
typedef void * WXFORMPTR;
typedef void * WXEVENTPTR;
typedef void * WXRECTANGLEPTR;
#endif /* __WXPALMOS__ */

9
include/wx/palmos/app.h
View File

@@ -93,16 +93,21 @@ extern int WXDLLEXPORT
wxEntry();
#define IMPLEMENT_WXWIN_MAIN \
\
extern "C" { \
\
uint32_t PilotMain(uint16_t cmd, MemPtr cmdPBP, uint16_t launchFlags) \
{ \
switch (cmd) { \
case sysAppLaunchCmdNormalLaunch: \
case 0 /* sysAppLaunchCmdNormalLaunch */ : \
wxEntry(); \
break; \
default: \
break; \
} \
return errNone; \
return 0 /* errNone */ ; \
} \
\
}
#endif // _WX_APP_H_

12
include/wx/palmos/control.h
View File

@@ -74,8 +74,8 @@ public:
protected:
// regardless how deeply we are in wxWidgets hierarchy always get correct form
FormType* GetParentForm() const;
FormType* GetObjectFormIndex(uint16_t& index) const;
WXFORMPTR GetParentForm() const;
WXFORMPTR GetObjectFormIndex(uint16_t& index) const;
void* GetObjectPtr() const;
// choose the default border for this window
@@ -105,7 +105,7 @@ protected:
// size parameter (style parameter is not needed because m_windowStyle is
// supposed to had been already set and so is used instead when this
// function is called)
bool PalmCreateControl(ControlStyleType style,
bool PalmCreateControl(int palmStyle,
const wxString& label,
const wxPoint& pos,
const wxSize& size,
@@ -117,7 +117,7 @@ protected:
const wxSize& size,
bool editable,
bool underlined,
JustificationType justification);
int justification);
inline bool IsPalmField() const { return m_palmField; }
// this is a helper for the derived class GetClassDefaultAttributes()
@@ -148,8 +148,8 @@ private:
// common part of all ctors
void Init();
virtual void DoGetBounds( RectangleType &rect ) const;
virtual void DoSetBounds( RectangleType &rect );
virtual void DoGetBounds( WXRECTANGLEPTR rect ) const;
virtual void DoSetBounds( WXRECTANGLEPTR rect );
DECLARE_DYNAMIC_CLASS_NO_COPY(wxControl)
DECLARE_EVENT_TABLE()

2
include/wx/palmos/frame.h
View File

@@ -70,7 +70,7 @@ public:
#if wxUSE_MENUS_NATIVE
bool HandleMenuOpen();
bool HandleMenuSelect(EventType* event);
bool HandleMenuSelect(WXEVENTPTR event);
#endif // wxUSE_MENUS_NATIVE
protected:

4
include/wx/palmos/progdlg.h
View File

@@ -37,11 +37,11 @@ public:
void Resume();
virtual bool Show( bool show = true );
Boolean Callback(PrgCallbackData *data);
Boolean Callback(/*PrgCallbackData */ void *data);
private:
ProgressType *m_prgFrame;
/*ProgressType*/ void *m_prgFrame;
wxString m_msg;
int m_max,m_cur;
bool m_canSkip;

2
include/wx/palmos/radiobut.h
View File

@@ -66,7 +66,7 @@ private:
uint8_t m_groupID;
// pushButtonCtl or checkboxCtl
ControlStyleType m_radioStyle;
int m_radioStyle;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxRadioButton)
};

2
include/wx/palmos/slider.h
View File

@@ -76,7 +76,7 @@ public:
// send a notification event, return true if processed
bool SendUpdatedEvent();
bool SendScrollEvent(EventType* event);
bool SendScrollEvent(WXEVENTPTR event);
protected:

10
include/wx/palmos/toplevel.h
View File

@@ -82,12 +82,12 @@ public:
wxWindow *GetLastFocus() const { return m_winLastFocused; }
// interface to native frame structure
FormType *GetForm() const;
WXFORMPTR GetForm() const;
// handle native events
bool HandleControlSelect(EventType* event);
bool HandleControlRepeat(EventType* event);
bool HandleSize(EventType* event);
bool HandleControlSelect(WXEVENTPTR event);
bool HandleControlRepeat(WXEVENTPTR event);
bool HandleSize(WXEVENTPTR event);
virtual WXWINHANDLE GetWinHandle() const;
@@ -125,7 +125,5 @@ protected:
DECLARE_NO_COPY_CLASS(wxTopLevelWindowPalm)
};
static Boolean FrameFormHandleEvent(EventType* pEvent);
#endif // _WX_PALMOS_TOPLEVEL_H_

8
include/wx/palmos/window.h
View File

@@ -211,11 +211,11 @@ public:
protected:
// the window handle
WinHandle m_handle;
FormType *FrameForm;
WXWINHANDLE m_handle;
WXFORMPTR FrameForm;
FormType *GetFormPtr();
void SetFormPtr(FormType *FormPtr);
WXFORMPTR GetFormPtr();
void SetFormPtr(WXFORMPTR FormPtr);
// additional (Palm specific) flags
bool m_mouseInWindow:1;

6
include/wx/platform.h
View File

@@ -472,12 +472,6 @@
# include "wx/msw/wince/libraries.h"
#endif
/* Force inclusion of main PalmOS header: */
#ifdef __WXPALMOS__
# include <PalmOS.h>
# undef Abs
#endif
/*
This macro can be used to test the gcc version and can be used like this:

8
include/wx/wxchar.h
View File

@@ -21,7 +21,7 @@
#include "wx/defs.h" /* for wxUSE_UNICODE */
#if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
char *strtok_r(char *, const char *, char **);
char *strtok_r(char *, const char *, char **);
#endif
/* check whether we have wchar_t and which size it is if we do */
@@ -127,7 +127,9 @@
#define wxHAVE_TCHAR_SUPPORT
#elif defined(__DMC__)
#define wxHAVE_TCHAR_SUPPORT
#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 ) && !defined(__WXPALMOS__)
#elif defined(__WXPALMOS__)
#include <stddef.h>
#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
#define wxHAVE_TCHAR_SUPPORT
#include <stddef.h>
#include <string.h>
@@ -387,7 +389,7 @@
/* time.h functions */
#define wxAsctime _tasctime
#define wxCtime _tctime
#define wxMbstowcs mbstowcs
#define wxWcstombs wcstombs
#else /* !TCHAR-aware compilers */

5
include/wx/wxprec.h
View File

@@ -45,6 +45,11 @@
#include "wx/msw/wrapwin.h"
#endif
// include all PalmOS headers at once
#ifdef __WXPALMOS__
# include <PalmOS.h>
#endif
// include the most common wx headers
#include "wx/wx.h"