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

Use __WXPALMOS__ for PalmOS port which fits __WX$(TOOLKIT)__ of bakefiles. Do not depend on MSW macros in PalmOS port. Source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-20 12:44:22 +00:00
parent 6305fabeeb
commit 4055ed8281
85 changed files with 499 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/app.h
View File

@@ -561,7 +561,7 @@ protected:
// ----------------------------------------------------------------------------
#if wxUSE_GUI
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/app.h"
#elif defined(__WXMSW__)
#include "wx/msw/app.h"

6
include/wx/apptrait.h
View File

@@ -79,7 +79,9 @@ public:
// wxStandardPaths object is normally the same for wxBase and wxGUI
// except in the case of wxMac and wxCocoa
#ifndef __WXPALMOS__
virtual wxStandardPathsBase& GetStandardPaths();
#endif
// functions abstracting differences between GUI and console modes
// ------------------------------------------------------------------------
@@ -139,7 +141,7 @@ public:
// NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the
// Unix code (and otherwise __UNIX__ wouldn't be defined)
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/apptbase.h"
#elif defined(__WXMSW__)
#include "wx/msw/apptbase.h"
@@ -224,7 +226,7 @@ public:
// include the platform-specific version of the classes above
// ----------------------------------------------------------------------------
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/apptrait.h"
#elif defined(__WXMSW__)
#include "wx/msw/apptrait.h"

2
include/wx/bitmap.h
View File

@@ -163,7 +163,7 @@ protected:
};
#endif
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/bitmap.h"
#elif defined(__WXMSW__)
#include "wx/msw/bitmap.h"

2
include/wx/brush.h
View File

@@ -17,7 +17,7 @@ public:
{ return (GetStyle()>=wxFIRST_HATCH) && (GetStyle()<=wxLAST_HATCH); }
};
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/brush.h"
#elif defined(__WXMSW__)
#include "wx/msw/brush.h"

2
include/wx/chkconf.h
View File

@@ -15,7 +15,7 @@
Compiler-specific checking.
*/
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
# include "wx/palmos/chkconf.h"
#elif defined(__WXMSW__)
# include "wx/msw/chkconf.h"

2
include/wx/colour.h
View File

@@ -1,7 +1,7 @@
#ifndef _WX_COLOUR_H_BASE_
#define _WX_COLOUR_H_BASE_
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/colour.h"
#elif defined(__WXMSW__)
#include "wx/msw/colour.h"

2
include/wx/control.h
View File

@@ -100,7 +100,7 @@ protected:
#if defined(__WXUNIVERSAL__)
#include "wx/univ/control.h"
#elif defined(__PALMOS__)
#elif defined(__WXPALMOS__)
#include "wx/palmos/control.h"
#elif defined(__WXMSW__)
#include "wx/msw/control.h"

2
include/wx/cursor.h
View File

@@ -1,7 +1,7 @@
#ifndef _WX_CURSOR_H_BASE_
#define _WX_CURSOR_H_BASE_
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/cursor.h"
#elif defined(__WXMSW__)
#include "wx/msw/cursor.h"

2
include/wx/dc.h
View File

@@ -791,7 +791,7 @@ private:
// now include the declaration of wxDC class
// ----------------------------------------------------------------------------
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/dc.h"
#elif defined(__WXMSW__)
#include "wx/msw/dc.h"

2
include/wx/dcclient.h
View File

@@ -1,7 +1,7 @@
#ifndef _WX_DCCLIENT_H_BASE_
#define _WX_DCCLIENT_H_BASE_
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/dcclient.h"
#elif defined(__WXMSW__)
#include "wx/msw/dcclient.h"

2
include/wx/dcmemory.h
View File

@@ -1,7 +1,7 @@
#ifndef _WX_DCMEMORY_H_BASE_
#define _WX_DCMEMORY_H_BASE_
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/dcmemory.h"
#elif defined(__WXMSW__)
#include "wx/msw/dcmemory.h"

2
include/wx/dcprint.h
View File

@@ -1,7 +1,7 @@
#ifndef _WX_DCPRINT_H_BASE_
#define _WX_DCPRINT_H_BASE_
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/dcprint.h"
#elif defined(__WXMSW__)
#include "wx/msw/dcprint.h"

2
include/wx/dcscreen.h
View File

@@ -1,7 +1,7 @@
#ifndef _WX_DCSCREEN_H_BASE_
#define _WX_DCSCREEN_H_BASE_
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/dcscreen.h"
#elif defined(__WXMSW__)
#include "wx/msw/dcscreen.h"

17
include/wx/defs.h
View File

@@ -26,8 +26,11 @@
/* Make sure the environment is set correctly */
# if defined(__WXMSW__) && defined(__X__)
# error "Target can't be both X and Windows"
# elif defined(__WXMSW__) && defined(__PALMOS__)
# error "Target can't be both PalmOS and Windows"
# elif !defined(__WXMOTIF__) && \
!defined(__WXMSW__) && \
!defined(__WXPALMOS__)&& \
!defined(__WXGTK__) && \
!defined(__WXPM__) && \
!defined(__WXMAC__) && \
@@ -678,7 +681,17 @@ typedef wxUint16 wxWord;
*/
/* 32bit */
#ifdef __WINDOWS__
#ifdef __PALMOS__
typedef int wxInt32;
typedef unsigned int wxUint32;
#define SIZEOF_INT 4
#define SIZEOF_LONG 4
#define SIZEOF_WCHAR_T 2
#define SIZEOF_SIZE_T 4
#define wxSIZE_T_IS_UINT
#define SIZEOF_VOID_P 4
#define SIZEOF_SIZE_T 4
#elif defined(__WINDOWS__)
/* Win64 uses LLP64 model and so ints and longs have the same size as in */
/* Win32 */
#if defined(__WIN32__)
@@ -2326,7 +2339,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSView);
typedef WX_NSView WXWidget; /* wxWidgets BASE definition */
#endif /* __WXCOCOA__ */
#ifdef __WXMSW__
#if defined(__WXMSW__) || defined(__WXPALMOS__)
/* the keywords needed for WinMain() declaration */
#ifndef WXFAR

2
include/wx/dialog.h
View File

@@ -71,7 +71,7 @@ protected:
#if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__)
#include "wx/univ/dialog.h"
#else
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/dialog.h"
#elif defined(__WXMSW__)
#include "wx/msw/dialog.h"

2
include/wx/encinfo.h
View File

@@ -35,7 +35,7 @@
struct WXDLLEXPORT wxNativeEncodingInfo
{
wxString facename; // may be empty meaning "any"
#ifndef __PALMOS__
#ifndef __WXPALMOS__
wxFontEncoding encoding; // so that we know what this struct represents
#if defined(__WXMSW__) || \

2
include/wx/evtloop.h
View File

@@ -72,7 +72,7 @@ protected:
// can sometimes be very useful (e.g. under MSW this is necessary for
// integration with MFC) but currently this is done for MSW only, other ports
// should follow a.s.a.p.
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/evtloop.h"
#elif defined(__WXMSW__)
#include "wx/msw/evtloop.h"

4
include/wx/filefn.h
View File

@@ -173,7 +173,7 @@ enum wxSeekMode
// detect compilers which have support for huge files (currently only
// Digital Mars doesn't)
#ifndef __PALMOS__
#ifndef __WXPALMOS__
#include "wx/msw/private.h"
#endif
@@ -299,7 +299,7 @@ enum wxSeekMode
#endif
// constants (unless already defined by the user code)
#if !defined(__BORLANDC__) && !defined(__WATCOMC__) && !defined(__PALMOS__)
#if !defined(__BORLANDC__) && !defined(__WATCOMC__) && !defined(__WXPALMOS__)
#ifndef O_RDONLY
#define O_RDONLY _O_RDONLY
#define O_WRONLY _O_WRONLY

4
include/wx/font.h
View File

@@ -142,7 +142,7 @@ public:
int family, // see wxFontFamily enum
int style, // see wxFontStyle enum
int weight, // see wxFontWeight enum
bool underlined = FALSE, // not underlined by default
bool underlined = false, // not underlined by default
const wxString& face = wxEmptyString, // facename
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // ISO8859-X, ...
@@ -231,7 +231,7 @@ private:
};
// include the real class declaration
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/font.h"
#elif defined(__WXMSW__)
#include "wx/msw/font.h"

4
include/wx/fontutil.h
View File

@@ -26,7 +26,7 @@
#include "wx/font.h" // for wxFont and wxFontEncoding
#if defined(__WXMSW__) && !defined(__PALMOS__)
#if defined(__WXMSW__) && !defined(__WXPALMOS__)
#include "wx/msw/wrapwin.h"
#endif
@@ -109,7 +109,7 @@ public:
// set the XFLD
void SetXFontName(const wxString& xFontName);
#elif defined(__WXMSW__) && !defined(__PALMOS__)
#elif defined(__WXMSW__) && !defined(__WXPALMOS__)
LOGFONT lf;
#elif defined(__WXPM__)
// OS/2 native structures that define a font

2
include/wx/frame.h
View File

@@ -247,7 +247,7 @@ protected:
#if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__)
#include "wx/univ/frame.h"
#else // !__WXUNIVERSAL__
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/frame.h"
#elif defined(__WXMSW__)
#include "wx/msw/frame.h"

2
include/wx/gdiobj.h
View File

@@ -1,7 +1,7 @@
#ifndef _WX_GDIOBJ_H_BASE_
#define _WX_GDIOBJ_H_BASE_
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/gdiobj.h"
#elif defined(__WXMSW__)
#include "wx/msw/gdiobj.h"

2
include/wx/help.h
View File

@@ -9,7 +9,7 @@
#include "wx/msw/wince/helpwce.h"
#define wxHelpController wxWinceHelpController
#elif defined(__PALMOS__)
#elif defined(__WXPALMOS__)
#include "wx/palmos/help.h"
#define wxHelpController wxPalmHelpController

2
include/wx/icon.h
View File

@@ -3,7 +3,7 @@
#include "wx/iconloc.h"
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/icon.h"
#elif defined(__WXMSW__)
#include "wx/msw/icon.h"

2
include/wx/menu.h
View File

@@ -498,7 +498,7 @@ protected:
#else // !wxUSE_BASE_CLASSES_ONLY
#if defined(__WXUNIVERSAL__)
#include "wx/univ/menu.h"
#elif defined(__PALMOS__)
#elif defined(__WXPALMOS__)
#include "wx/palmos/menu.h"
#elif defined(__WXMSW__)
#include "wx/msw/menu.h"

2
include/wx/menuitem.h
View File

@@ -155,7 +155,7 @@ private:
#else // !wxUSE_BASE_CLASSES_ONLY
#if defined(__WXUNIVERSAL__)
#include "wx/univ/menuitem.h"
#elif defined(__PALMOS__)
#elif defined(__WXPALMOS__)
#include "wx/palmos/menuitem.h"
#elif defined(__WXMSW__)
#include "wx/msw/menuitem.h"

4
include/wx/metafile.h
View File

@@ -21,7 +21,7 @@
#if defined(__WXMSW__)
#if wxUSE_ENH_METAFILE
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/enhmeta.h"
#else
#include "wx/msw/enhmeta.h"
@@ -38,7 +38,7 @@
#define wxMETAFILE_IS_ENH
#endif // wxUSE_WIN_METAFILES_ALWAYS
#else // !wxUSE_ENH_METAFILE
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/metafile.h"
#else
#include "wx/msw/metafile.h"

2
include/wx/minifram.h
View File

@@ -1,7 +1,7 @@
#ifndef _WX_MINIFRAM_H_BASE_
#define _WX_MINIFRAMH_BASE_
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/minifram.h"
#elif defined(__WXMSW__)
#include "wx/msw/minifram.h"

2
include/wx/msgdlg.h
View File

@@ -7,7 +7,7 @@
#if defined(__WXUNIVERSAL__) || defined(__WXGPE__)
#include "wx/generic/msgdlgg.h"
#elif defined(__PALMOS__)
#elif defined(__WXPALMOS__)
#include "wx/palmos/msgdlg.h"
#elif defined(__WXMSW__)
#include "wx/msw/msgdlg.h"

2
include/wx/palette.h
View File

@@ -18,7 +18,7 @@ public:
virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; };
};
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/palette.h"
#elif defined(__WXMSW__)
#include "wx/msw/palette.h"

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

@@ -4,7 +4,7 @@
// Author: William Osborne
// Modified by:
// Created: 10/17/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -99,7 +99,6 @@ protected:
extern int WXDLLEXPORT
wxEntry();
#include <PalmOS.h>
#define IMPLEMENT_WXWIN_MAIN \
uint32_t PilotMain(uint16_t cmd, MemPtr cmdPBP, uint16_t launchFlags) \
{ \
@@ -112,6 +111,6 @@ wxEntry();
} \
return errNone; \
}
#endif // _WX_APP_H_

7
include/wx/palmos/bitmap.h
View File

@@ -4,7 +4,7 @@
// Author: William Osborne
// Modified by:
// Created: 10/13/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -198,11 +198,6 @@ protected:
#endif // wxUSE_IMAGE
private:
#ifdef __WIN32__
// common part of CopyFromIcon/CopyFromCursor for Win32
bool CopyFromIconOrCursor(const wxGDIImage& icon);
#endif // __WIN32__
DECLARE_DYNAMIC_CLASS(wxBitmap)
};

15
include/wx/palmos/button.h
View File

@@ -4,7 +4,7 @@
// Author: William Osborne
// Modified by:
// Created: 10/13/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -59,20 +59,9 @@ public:
// avoide switching into owner-drawn mode
wxControl::SetBackgroundColour(bg);
}
#ifdef __WIN32__
// coloured buttons support
virtual bool SetBackgroundColour(const wxColour &colour);
virtual bool SetForegroundColour(const wxColour &colour);
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
private:
void MakeOwnerDrawn();
#endif // __WIN32__
protected:
// send a notification event, return TRUE if processed
// send a notification event, return true if processed
bool SendClickEvent();
// default button handling

19
include/wx/palmos/chkconf.h
View File

@@ -4,7 +4,7 @@
* Author: William Osborne
* Modified by:
* Created: 10/13/04
* RCS-ID: $Id:
* RCS-ID: $Id:
* Copyright: (c) William Osborne
* Licence: wxWindows licence
*/
@@ -96,23 +96,6 @@
#define wxUSE_CHECKLISTBOX 0
#endif
#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
/* BC++ 4.0 can't compile JPEG library */
#undef wxUSE_LIBJPEG
#define wxUSE_LIBJPEG 0
#endif
/* wxUSE_DEBUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode */
#if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL))
#undef wxUSE_DEBUG_NEW_ALWAYS
#define wxUSE_DEBUG_NEW_ALWAYS 0
#endif
#if defined(__WXMSW__) && (defined(__WATCOMC__) && __WATCOMC__ < 1200)
#undef wxUSE_WCHAR_T
#define wxUSE_WCHAR_T 0
#endif
#endif
/* _WX_PALMOS_CHKCONF_H_ */

13
include/wx/palmos/dragimag.h
View File

@@ -5,7 +5,7 @@
// Author: William Osborne
// Modified by:
// Created: 10/13/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -31,10 +31,6 @@
void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
{
#ifdef __WXMSW__
::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWidgets
#endif
CaptureMouse();
m_dragImage = new wxDragImage(* this, itemId);
@@ -62,11 +58,6 @@
// Do some updating of the window, such as highlighting the drop target
...
#ifdef __WXMSW__
if (updateWindow)
::UpdateWindow((HWND) GetHWND());
#endif
// Move and show the image again
m_dragImage->Move(event.GetPosition(), this);
m_dragImage->Show(this);
@@ -216,7 +207,7 @@ public:
// Begin drag. hotspot is the location of the drag position relative to the upper-left
// corner of the image.
bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = FALSE, wxRect* rect = (wxRect*) NULL);
bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = false, wxRect* rect = (wxRect*) NULL);
// Begin drag. hotspot is the location of the drag position relative to the upper-left
// corner of the image. This is full screen only. fullScreenRect gives the

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

@@ -1,10 +1,10 @@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/palmos/enhmeta.h
// Purpose: wxEnhMetaFile class for Win32
// Purpose: wxEnhMetaFile class for PalmOS
// Author: William Osborne
// Modified by:
// Created: 10/13/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////

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

@@ -4,7 +4,7 @@
// Author: William Osborne
// Modified by:
// Created: 10/14/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -127,14 +127,6 @@ public:
virtual WXHANDLE GetResourceHandle() const;
virtual bool FreeResource(bool force = false);
// for consistency with other wxMSW classes
WXHFONT GetHFONT() const;
/*
virtual bool UseResource();
virtual bool ReleaseResource();
*/
protected:
// real font creation function, used in all cases
bool DoCreate(int size,

7
include/wx/palmos/gccpriv.h
View File

@@ -4,6 +4,9 @@
#ifndef _WX_MSW_GCCPRIV_H_
#define _WX_MSW_GCCPRIV_H_
#include <PalmOS.h>
#undef Abs
#if defined(__MINGW32__) && !defined(__GNUWIN32__)
#define __GNUWIN32__
#endif
@@ -16,12 +19,12 @@
#endif
#endif
#elif defined( __CYGWIN__ ) && !defined( HAVE_W32API_H )
#if ( __GNUC__ > 2 )
#if ( __GNUC__ > 2 )
#define HAVE_W32API_H
#endif
#endif
#if (defined(__WATCOMC__) && __WATCOMC__ >= 1200)
#if (defined(__WATCOMC__) && __WATCOMC__ >= 1200)
#define HAVE_W32API_H
#endif

26
include/wx/palmos/menu.h
View File

@@ -4,7 +4,7 @@
// Author: William Osborne
// Modified by:
// Created: 10/13/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -102,7 +102,7 @@ private:
// terminate the current radio group, if any
void EndRadioGroup();
// if TRUE, insert a break before appending the next item
// if true, insert a break before appending the next item
bool m_doBreak;
// the position of the first item in the current radio group or -1
@@ -129,7 +129,7 @@ public :
wxMenuInfo() { m_menu = NULL ; }
virtual ~wxMenuInfo() { }
void Create( wxMenu *menu , const wxString &title )
void Create( wxMenu *menu , const wxString &title )
{ m_menu = menu ; m_title = title ; }
wxMenu* GetMenu() const { return m_menu ; }
wxString GetTitle() const { return m_title ; }
@@ -145,7 +145,7 @@ WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList );
class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
{
public:
// ctors & dtor
// ctors & dtor
// default constructor
wxMenuBar();
@@ -175,17 +175,6 @@ public:
void LoadMenu();
int ProcessCommand(int ItemID);
#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))
// Under WinCE, a menubar is owned by the frame's toolbar
void SetToolBar(wxToolBar* toolBar) { m_toolBar = toolBar; }
wxToolBar* GetToolBar() const { return m_toolBar; }
#endif
#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))
WXHWND GetCommandBar() const { return m_commandBar; }
bool AddAdornments(long style);
#endif
#if wxUSE_ACCEL
// get the accel table for all the menus
const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }
@@ -225,13 +214,6 @@ protected:
#if defined(__WXWINCE__) && wxUSE_TOOLBAR
wxToolBar* m_toolBar;
#endif
// Not using a combined wxToolBar/wxMenuBar? then use
// a commandbar in WinCE .NET to implement the
// menubar, since there is no ::SetMenu function.
#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))
WXHWND m_commandBar;
bool m_adornmentsAdded;
#endif
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar)

19
include/wx/palmos/mslu.h
View File

@@ -17,7 +17,7 @@
#include "wx/wxchar.h"
#if !wxUSE_UNICODE_MSLU
inline bool wxUsingUnicowsDll() { return FALSE; }
inline bool wxUsingUnicowsDll() { return false; }
#else
// Returns true if we are running under Unicode emulation in Win9x environment.
@@ -33,9 +33,9 @@ inline bool wxUsingUnicowsDll()
#if wxUSE_GUI
WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc,
WXLPARAM lData, WXWPARAM wData,
int x, int y, int cx, int cy,
WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc,
WXLPARAM lData, WXWPARAM wData,
int x, int y, int cx, int cy,
unsigned int flags);
#define DrawStateW(dc, br, func, ld, wd, x, y, cx, cy, flags) \
wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \
@@ -56,17 +56,6 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn);
WXDLLEXPORT int wxMSLU__trename(const wxChar *oldname, const wxChar *newname);
WXDLLEXPORT int wxMSLU__tremove(const wxChar *name);
#if defined( __VISUALC__ ) \
|| ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
|| ( defined(__MWERKS__) && defined(__WXMSW__) ) \
|| ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) )
WXDLLEXPORT int wxMSLU__wopen(const wxChar *name, int flags, int mode);
WXDLLEXPORT int wxMSLU__waccess(const wxChar *name, int mode);
WXDLLEXPORT int wxMSLU__wmkdir(const wxChar *name);
WXDLLEXPORT int wxMSLU__wrmdir(const wxChar *name);
WXDLLEXPORT int wxMSLU__wstat(const wxChar *name, struct _stat *buffer);
#endif
#endif // wxUSE_UNICODE_MSLU
#endif // _WX_MSLU_H_

6
include/wx/palmos/popupwin.h
View File

@@ -1,10 +1,10 @@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/palmos/popupwin.h
// Purpose: wxPopupWindow class for wxMSW
// Purpose: wxPopupWindow class for PalmOS
// Author: William Osborne
// Modified by:
// Created: 10/13/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,7 @@ public:
bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
virtual bool Show(bool show = TRUE);
virtual bool Show(bool show = true);
protected:
// popups handle the position like wxTopLevelWindow, not wxWindow

49
include/wx/palmos/registry.h
View File

@@ -4,7 +4,7 @@
// Author: William Osborne
// Modified by:
// Created: 10/13/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -32,7 +32,7 @@ typedef unsigned long ulong;
// ----------------------------------------------------------------------------
// class wxRegKey encapsulates window HKEY handle
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxRegKey
class WXDLLIMPEXP_BASE wxRegKey
{
public:
// NB: do _not_ change the values of elements in these enumerations!
@@ -42,38 +42,12 @@ public:
{
Type_None, // No value type
Type_String, // Unicode nul terminated string
#ifdef __WIN32__
Type_Expand_String, // Unicode nul terminated string
// (with environment variable references)
Type_Binary, // Free form binary
Type_Dword, // 32-bit number
Type_Dword_little_endian // 32-bit number
= Type_Dword, // (same as Type_DWORD)
Type_Dword_big_endian, // 32-bit number
Type_Link, // Symbolic Link (unicode)
Type_Multi_String, // Multiple Unicode strings
Type_Resource_list, // Resource list in the resource map
Type_Full_resource_descriptor, // Resource list in the hardware description
Type_Resource_requirements_list // ???
#endif //WIN32
};
// predefined registry keys
enum StdKey
{
HKCR // classes root
#ifdef __WIN32__
,
HKCU, // current user
HKLM, // local machine
HKUSR, // users
HKPD // performance data (WinNT/2K only)
#if WINVER >= 0x0400
,
HKCC, // current config (starting from Win95/NT 4.0)
HKDD // dynamic data (Win95/98 only)
#endif // Winver
#endif // Win32/16
};
// access mode for the key
@@ -121,7 +95,7 @@ public:
// get infomation about the key
// get the (full) key name. Abbreviate std root keys if bShortPrefix.
wxString GetName(bool bShortPrefix = TRUE) const;
wxString GetName(bool bShortPrefix = true) const;
// return true if the key exists
bool Exists() const;
// get the info about key (any number of these pointers may be NULL)
@@ -139,7 +113,7 @@ public:
// which need the key to be opened if the key is not opened yet)
bool Open(AccessMode mode = Write);
// create the key: will fail if the key already exists and !bOkIfExists
bool Create(bool bOkIfExists = TRUE);
bool Create(bool bOkIfExists = true);
// rename a value from old name to new one
bool RenameValue(const wxChar *szValueOld, const wxChar *szValueNew);
// rename the key
@@ -166,14 +140,12 @@ public:
// access to values and subkeys
// get value type
ValueType GetValueType(const wxChar *szValue) const;
// returns TRUE if the value contains a number (else it's some string)
// returns true if the value contains a number (else it's some string)
bool IsNumericValue(const wxChar *szValue) const;
// assignment operators set the default value of the key
wxRegKey& operator=(const wxString& strValue)
{ SetValue(NULL, strValue); return *this; }
wxRegKey& operator=(long lValue)
{ SetValue(NULL, lValue); return *this; }
// query the default value of the key: implicitly or explicitly
wxString QueryDefaultValue() const;
@@ -185,20 +157,13 @@ public:
bool SetValue(const wxChar *szValue, const wxString& strValue);
// retrieve the string value
bool QueryValue(const wxChar *szValue, wxString& strValue) const
{ return QueryValue(szValue, strValue, FALSE); }
{ return QueryValue(szValue, strValue, false); }
// retrieve raw string value
bool QueryRawValue(const wxChar *szValue, wxString& strValue) const
{ return QueryValue(szValue, strValue, TRUE); }
{ return QueryValue(szValue, strValue, true); }
// retrieve either raw or expanded string value
bool QueryValue(const wxChar *szValue, wxString& strValue, bool raw) const;
#ifdef __WIN32__
// set the numeric value
bool SetValue(const wxChar *szValue, long lValue);
// return the numeric value
bool QueryValue(const wxChar *szValue, long *plValue) const;
#endif //Win32
// query existence of a key/value
// return true if value exists
bool HasValue(const wxChar *szKey) const;

14
include/wx/palmos/textctrl.h
View File

@@ -4,7 +4,7 @@
// Author: William Osborne
// Modified by:
// Created: 10/13/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -84,10 +84,6 @@ public:
virtual void WriteText(const wxString& text);
virtual void AppendText(const wxString& text);
#ifdef __WIN32__
virtual bool EmulateKeyPress(const wxKeyEvent& event);
#endif // __WIN32__
#if wxUSE_RICHEDIT
// apply text attribute to the range of text (only works with richedit
// controls)
@@ -216,10 +212,10 @@ protected:
// replace the contents of the selection or of the entire control with the
// given text
void DoWriteText(const wxString& text, bool selectionOnly = TRUE);
void DoWriteText(const wxString& text, bool selectionOnly = true);
// set the selection possibly without scrolling the caret into view
void DoSetSelection(long from, long to, bool scrollCaret = TRUE);
void DoSetSelection(long from, long to, bool scrollCaret = true);
// return true if there is a non empty selection in the control
bool HasSelection() const;
@@ -228,7 +224,7 @@ protected:
// position
long GetLengthOfLineContainingPos(long pos) const;
// send TEXT_UPDATED event, return TRUE if it was handled, FALSE otherwise
// send TEXT_UPDATED event, return true if it was handled, false otherwise
bool SendUpdateEvent();
// override some base class virtuals
@@ -244,7 +240,7 @@ protected:
int m_verRichEdit;
#endif // wxUSE_RICHEDIT
// if TRUE, SendUpdateEvent() will eat the next event (see comments in the
// if true, SendUpdateEvent() will eat the next event (see comments in the
// code as to why this is needed)
bool m_suppressNextUpdate;

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

@@ -4,7 +4,7 @@
// Author: William Osborne
// Modified by:
// Created: 10/13/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -16,10 +16,6 @@
#pragma interface "toplevel.h"
#endif
#ifdef __PALMOS__
#include <PalmOS.h>
#endif
// ----------------------------------------------------------------------------
// wxTopLevelWindowPalm
// ----------------------------------------------------------------------------
@@ -50,7 +46,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
bool Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
@@ -59,13 +55,13 @@ public:
long style,
const wxString& name,
wxFrame* PFrame);
virtual ~wxTopLevelWindowPalm();
// implement base class pure virtuals
virtual void Maximize(bool maximize = TRUE);
virtual void Maximize(bool maximize = true);
virtual bool IsMaximized() const;
virtual void Iconize(bool iconize = TRUE);
virtual void Iconize(bool iconize = true);
virtual bool IsIconized() const;
virtual void SetIcon(const wxIcon& icon);
virtual void SetIcons(const wxIconBundle& icons );
@@ -75,14 +71,14 @@ public:
virtual bool SetShape(const wxRegion& region);
#endif // __WXWINCE__
virtual bool Show(bool show = TRUE);
virtual bool Show(bool show = true);
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool IsFullScreen() const { return m_fsIsShowing; }
// wxPalm only: EnableCloseButton(FALSE) may be used to remove the "Close"
// wxPalm only: EnableCloseButton(false) may be used to remove the "Close"
// button from the title bar
bool EnableCloseButton(bool enable = TRUE);
bool EnableCloseButton(bool enable = true);
// implementation from now on
// --------------------------
@@ -98,13 +94,13 @@ protected:
// common part of all ctors
void Init();
// create a new frame, return FALSE if it couldn't be created
// create a new frame, return false if it couldn't be created
bool CreateFrame(const wxString& title,
const wxPoint& pos,
const wxSize& size);
// create a new dialog using the given dialog template from resources,
// return FALSE if it couldn't be created
// return false if it couldn't be created
bool CreateDialog(const void *dlgTemplate,
const wxString& title,
const wxPoint& pos,

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

@@ -12,11 +12,6 @@
#ifndef _WX_WINDOW_H_
#define _WX_WINDOW_H_
#ifdef __PALMOS__
#include <PalmOS.h>
#endif
// ---------------------------------------------------------------------------
// headers
// ---------------------------------------------------------------------------
@@ -336,9 +331,6 @@ public:
#if wxUSE_ACCEL
bool HandleHotKey(WXWPARAM wParam, WXLPARAM lParam);
#endif
#ifdef __WIN32__
int HandleMenuChar(int chAccel, WXLPARAM lParam);
#endif
bool HandleQueryDragIcon(WXHICON *hIcon);

2
include/wx/pen.h
View File

@@ -1,7 +1,7 @@
#ifndef _WX_PEN_H_BASE_
#define _WX_PEN_H_BASE_
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/pen.h"
#elif defined(__WXMSW__)
#include "wx/msw/pen.h"

36
include/wx/platform.h
View File

@@ -72,6 +72,27 @@
# endif
#endif
#if defined(__PALMOS__)
# ifndef __WXPALMOS__
# define __WXPALMOS__
# endif
# ifdef __WXMSW__
# undef __WXMSW__
# endif
# ifdef __WINDOWS__
# undef __WINDOWS__
# endif
# ifdef __WIN32__
# undef __WIN32__
# endif
# ifdef WIN32
# undef WIN32
# endif
# ifdef _WIN32
# undef _WIN32
# endif
#endif
#if defined(_WIN64)
# ifndef _WIN32
/*
@@ -392,6 +413,17 @@
# endif
# define wxSIZE_T_IS_UINT
#elif defined(__PALMOS__)
# ifdef __WIN32__
# error "__WIN32__ should not be defined for PalmOS"
# endif
# ifdef __WINDOWS__
# error "__WINDOWS__ should not be defined for PalmOS"
# endif
# ifdef __WXMSW__
# error "__WXMSW__ should not be defined for PalmOS"
# endif
#else /* Windows */
# ifndef __WINDOWS__
# define __WINDOWS__
@@ -465,7 +497,7 @@
This macro can be used to check that the version of mingw32 compiler is
at least maj.min
*/
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
# include "wx/palmos/gccpriv.h"
#elif ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
defined( __CYGWIN__ ) || \
@@ -524,7 +556,7 @@
#endif
/*
We need AvailabilityMacros.h for ifdefing out things that don't exist on
We need AvailabilityMacros.h for ifdefing out things that don't exist on
OSX 10.2 and lower
FIXME: We need a better way to detect for 10.3 then including a system header
*/

2
include/wx/region.h
View File

@@ -3,7 +3,7 @@
#include "wx/colour.h"
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/region.h"
#elif defined(__WXMSW__)
#include "wx/msw/region.h"

2
include/wx/renderer.h
View File

@@ -31,7 +31,7 @@ class WXDLLEXPORT wxWindow;
#include "wx/gdicmn.h" // for wxPoint
// some platforms have their own renderers, others use the generic one
#if (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK__)) && !defined(__PALMOS__)
#if (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK__)) && !defined(__WXPALMOS__)
#define wxHAS_NATIVE_RENDERER
#else
#undef wxHAS_NATIVE_RENDERER

2
include/wx/statusbr.h
View File

@@ -150,7 +150,7 @@ protected:
#define wxStatusBarUniv wxStatusBar
#include "wx/univ/statusbr.h"
#elif defined(__PALMOS__)
#elif defined(__WXPALMOS__)
#define wxStatusBarPalm wxStatusBar
#include "wx/palmos/statusbr.h"

6
include/wx/string.h
View File

@@ -51,7 +51,7 @@
#include <strings.h> // for strcasecmp()
#endif // HAVE_STRCASECMP_IN_STRINGS_H
#ifdef __PALMOS__
#ifdef __WXPALMOS__
#include <StringMgr.h>
#endif
@@ -1357,8 +1357,8 @@ class WXDLLIMPEXP_BASE wxStringBufferLength
public:
wxStringBufferLength(wxString& str, size_t lenWanted = 1024)
: m_str(str), m_buf(NULL), m_len(0), m_lenSet(false)
{
m_buf = m_str.GetWriteBuf(lenWanted);
{
m_buf = m_str.GetWriteBuf(lenWanted);
wxASSERT(m_buf != NULL);
}

2
include/wx/taskbar.h
View File

@@ -41,7 +41,7 @@ private:
// now include the actual class declaration
// ----------------------------------------------------------------------------
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/taskbar.h"
#elif defined(__WXMSW__)
#include "wx/msw/taskbar.h"

2
include/wx/toolbar.h
View File

@@ -123,7 +123,7 @@ enum
#else // wxUSE_TOOLBAR_NATIVE
#if defined(__WXUNIVERSAL__)
#include "wx/univ/toolbar.h"
#elif defined(__PALMOS__)
#elif defined(__WXPALMOS__)
#include "wx/palmos/toolbar.h"
#elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
#include "wx/msw/tbar95.h"

2
include/wx/toplevel.h
View File

@@ -245,7 +245,7 @@ protected:
// include the real class declaration
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#include "wx/palmos/toplevel.h"
#define wxTopLevelWindowNative wxTopLevelWindowPalm
#elif defined(__WXMSW__)

2
include/wx/treectrl.h
View File

@@ -9,7 +9,7 @@
#if defined(__WXUNIVERSAL__)
#include "wx/generic/treectlg.h"
#elif defined(__PALMOS__)
#elif defined(__WXPALMOS__)
#include "wx/palmos/treectrl.h"
#elif defined(__WXMSW__)
#include "wx/msw/treectrl.h"

2
include/wx/window.h
View File

@@ -1317,7 +1317,7 @@ private:
// ----------------------------------------------------------------------------
// include the declaration of the platform-specific class
#if defined(__PALMOS__)
#if defined(__WXPALMOS__)
#ifdef __WXUNIVERSAL__
#define wxWindowNative wxWindowPalm
#else // !wxUniv

50
include/wx/wxchar.h
View File

@@ -118,7 +118,7 @@
#define wxHAVE_TCHAR_SUPPORT
#elif defined(__DMC__)
#define wxHAVE_TCHAR_SUPPORT
#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 ) && !defined(__PALMOS__)
#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 ) && !defined(__WXPALMOS__)
#define wxHAVE_TCHAR_SUPPORT
#include <stddef.h>
#include <string.h>
@@ -247,7 +247,7 @@
#else
#define WXWCHAR_T_CAST(c) c
#endif
/* ctype.h functions */
#define wxIsalnum(c) _istalnum(WXWCHAR_T_CAST(c))
#define wxIsalpha(c) _istalpha(WXWCHAR_T_CAST(c))
@@ -369,22 +369,22 @@
#else /* !TCHAR-aware compilers */
#if !defined(__MWERKS__) && defined(__DARWIN__) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )
/* even though they are defined and "implemented", they are bad and just
/* even though they are defined and "implemented", they are bad and just
stubs so we need our own - we need these even in ANSI builds!! */
#define mbstowcs wxInternalMbstowcs
#define wcstombs wxInternalWcstombs
WXDLLIMPEXP_BASE size_t wxInternalMbstowcs (wchar_t *, const char *, size_t);
WXDLLIMPEXP_BASE size_t wxInternalWcstombs (char *, const wchar_t *, size_t);
WXDLLIMPEXP_BASE size_t wxInternalWcstombs (char *, const wchar_t *, size_t);
#endif
/* No UNICODE in the c library except wchar_t typedef on mac OSX 10.2 and less - roll our own */
#if !defined(__MWERKS__) && wxUSE_UNICODE && defined(__DARWIN__) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )
/* we need everything! */
#define wxNEED_WX_STRING_H
#define wxNEED_WX_CTYPE_H
#define wxFgetchar(c) wxFgetc(c, stdin)
#define wxFputc wxPutc
#define wxFputchar(c) wxPutc(c, stdout)
@@ -401,11 +401,11 @@
#define wxNEED_FPUTS
#define wxNEED_PUTS
#define wxNEED_PUTC
int wxFputs(const wxChar *ch, FILE *stream);
int wxPuts(const wxChar *ws);
int wxPutc(wxChar ch, FILE *stream);
#ifdef __cplusplus
extern "C" {
#endif
@@ -415,12 +415,12 @@
#endif
#define wxPutchar(wch) wxPutc(wch, stdout)
#define wxNEED_PRINTF_CONVERSION
#define wxNEED_WX_STDIO_H
#define wxNEED_WX_STDLIB_H
#define wxNEED_WX_TIME_H
#elif wxUSE_UNICODE
#include <wctype.h>
@@ -699,12 +699,12 @@
defined(__EMX__) || defined(__DJGPP__)
#define wxStricmp stricmp
#define wxStrnicmp strnicmp
#elif defined(__PALMOS__)
/* FIXME: There is no equivalent to strnicmp in the Palm OS API. This
* quick hack should do until one can be written.
#elif defined(__WXPALMOS__)
/* FIXME: There is no equivalent to strnicmp in the Palm OS API. This
* quick hack should do until one can be written.
*/
#define wxStricmp StrCaselessCompare
#define wxStrnicmp strnicmp
#define wxStrnicmp strnicmp
#elif defined(__SYMANTEC__) || defined(__VISUALC__) || \
(defined(__MWERKS__) && defined(__INTEL__))
#define wxStricmp _stricmp
@@ -944,14 +944,14 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
WXDLLIMPEXP_BASE char *strdup(const char* s);
#endif
/* RN: Used only under OSX <= 10.2 currently
/* RN: Used only under OSX <= 10.2 currently
The __cplusplus ifdefs are messy, but they are required to build
the regex library, since c does not support function overloading
*/
#ifdef wxNEED_WX_STRING_H
# ifdef __cplusplus
# ifdef __cplusplus
extern "C" {
# endif
# endif
WXDLLIMPEXP_BASE wxChar * wxStrcat(wxChar *dest, const wxChar *src);
WXDLLIMPEXP_BASE const wxChar * wxStrchr(const wxChar *s, wxChar c);
WXDLLIMPEXP_BASE int wxStrcmp(const wxChar *s1, const wxChar *s2);
@@ -965,9 +965,9 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
WXDLLIMPEXP_BASE const wxChar * wxStrrchr(const wxChar *s, wxChar c);
WXDLLIMPEXP_BASE size_t wxStrspn(const wxChar *s, const wxChar *accept);
WXDLLIMPEXP_BASE const wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle);
# ifdef __cplusplus
# ifdef __cplusplus
}
# endif
# endif
/* These functions use C++, so we can't c extern them */
WXDLLIMPEXP_BASE double wxStrtod(const wxChar *nptr, wxChar **endptr);
@@ -1097,23 +1097,23 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
//
// RN: The following are not normal versions of memcpy et al., rather
// these are either char or widechar versions depending on
// these are either char or widechar versions depending on
// if unicode is used or not.
//
#ifdef __cplusplus
//
// RN: We could do the usual tricky compiler detection here,
// RN: We could do the usual tricky compiler detection here,
// and use their variant (such as wmemchr, etc.). The problem
// is that these functions are quite rare, even though they are
// is that these functions are quite rare, even though they are
// part of the current POSIX standard. In addition, most compilers
// (including even MSC) inline them just like we do right in their
// headers.
//
#if wxUSE_UNICODE
#include <string.h> //for mem funcs
//implement our own wmem variants
inline wxChar* wxTmemchr(const wxChar* s, wxChar c, size_t l)
{