From 4055ed8281971e3d35bf04177193c27043d42ed1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 20 Dec 2004 12:44:22 +0000 Subject: [PATCH] Use __WXPALMOS__ for PalmOS port which fits __WX$(TOOLKIT)__ of bakefiles. Do not depend on MSW macros in PalmOS port. Source cleaning. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/app.h | 2 +- include/wx/apptrait.h | 6 +- include/wx/bitmap.h | 2 +- include/wx/brush.h | 2 +- include/wx/chkconf.h | 2 +- include/wx/colour.h | 2 +- include/wx/control.h | 2 +- include/wx/cursor.h | 2 +- include/wx/dc.h | 2 +- include/wx/dcclient.h | 2 +- include/wx/dcmemory.h | 2 +- include/wx/dcprint.h | 2 +- include/wx/dcscreen.h | 2 +- include/wx/defs.h | 17 ++- include/wx/dialog.h | 2 +- include/wx/encinfo.h | 2 +- include/wx/evtloop.h | 2 +- include/wx/filefn.h | 4 +- include/wx/font.h | 4 +- include/wx/fontutil.h | 4 +- include/wx/frame.h | 2 +- include/wx/gdiobj.h | 2 +- include/wx/help.h | 2 +- include/wx/icon.h | 2 +- include/wx/menu.h | 2 +- include/wx/menuitem.h | 2 +- include/wx/metafile.h | 4 +- include/wx/minifram.h | 2 +- include/wx/msgdlg.h | 2 +- include/wx/palette.h | 2 +- include/wx/palmos/app.h | 5 +- include/wx/palmos/bitmap.h | 7 +- include/wx/palmos/button.h | 15 +-- include/wx/palmos/chkconf.h | 19 +-- include/wx/palmos/dragimag.h | 13 +- include/wx/palmos/enhmeta.h | 4 +- include/wx/palmos/font.h | 10 +- include/wx/palmos/gccpriv.h | 7 +- include/wx/palmos/menu.h | 26 +--- include/wx/palmos/mslu.h | 19 +-- include/wx/palmos/popupwin.h | 6 +- include/wx/palmos/registry.h | 49 +------ include/wx/palmos/textctrl.h | 14 +- include/wx/palmos/toplevel.h | 24 ++-- include/wx/palmos/window.h | 8 -- include/wx/pen.h | 2 +- include/wx/platform.h | 36 ++++- include/wx/region.h | 2 +- include/wx/renderer.h | 2 +- include/wx/statusbr.h | 2 +- include/wx/string.h | 6 +- include/wx/taskbar.h | 2 +- include/wx/toolbar.h | 2 +- include/wx/toplevel.h | 2 +- include/wx/treectrl.h | 2 +- include/wx/window.h | 2 +- include/wx/wxchar.h | 50 +++---- src/common/appbase.cpp | 4 +- src/common/appcmn.cpp | 4 +- src/common/cmndata.cpp | 18 +-- src/common/containr.cpp | 4 +- src/common/fontcmn.cpp | 2 +- src/common/gdicmn.cpp | 2 +- src/common/init.cpp | 2 +- src/common/msgout.cpp | 4 +- src/common/textbuf.cpp | 8 +- src/common/utilscmn.cpp | 6 +- src/generic/imaglist.cpp | 4 +- src/generic/notebook.cpp | 6 +- src/palmos/app.cpp | 14 +- src/palmos/bitmap.cpp | 59 ++++---- src/palmos/button.cpp | 49 +------ src/palmos/dialup.cpp | 64 ++++----- src/palmos/dir.cpp | 4 +- src/palmos/font.cpp | 19 +-- src/palmos/joystick.cpp | 8 +- src/palmos/menu.cpp | 128 ++++++++---------- src/palmos/metafile.cpp | 21 +-- src/palmos/mimetype.cpp | 89 ++++++------ src/palmos/mslu.cpp | 57 +------- src/palmos/ownerdrw.cpp | 17 +-- src/palmos/registry.cpp | 254 ++++++++++++++--------------------- src/palmos/renderer.cpp | 12 +- src/palmos/textctrl.cpp | 17 +-- src/palmos/window.cpp | 11 +- 85 files changed, 499 insertions(+), 811 deletions(-) diff --git a/include/wx/app.h b/include/wx/app.h index a68433c157..cb92cac14a 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -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" diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index e9f9accdac..6ef915d9b1 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -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" diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index c17ef0ad6f..357c563685 100644 --- a/include/wx/bitmap.h +++ b/include/wx/bitmap.h @@ -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" diff --git a/include/wx/brush.h b/include/wx/brush.h index 96919b74b9..06e9290a89 100644 --- a/include/wx/brush.h +++ b/include/wx/brush.h @@ -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" diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 3d05c7c85c..bf26c9d780 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -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" diff --git a/include/wx/colour.h b/include/wx/colour.h index 1c44ce4ef7..da566b2dc7 100644 --- a/include/wx/colour.h +++ b/include/wx/colour.h @@ -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" diff --git a/include/wx/control.h b/include/wx/control.h index 64306ff8da..2df5ef5fa3 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -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" diff --git a/include/wx/cursor.h b/include/wx/cursor.h index d6dcec4abd..4eb52242a9 100644 --- a/include/wx/cursor.h +++ b/include/wx/cursor.h @@ -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" diff --git a/include/wx/dc.h b/include/wx/dc.h index 3b5336c86d..3546f82a1d 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -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" diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h index 4bdbf47e40..e5124c207f 100644 --- a/include/wx/dcclient.h +++ b/include/wx/dcclient.h @@ -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" diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h index 0c51105858..80d3c7f5de 100644 --- a/include/wx/dcmemory.h +++ b/include/wx/dcmemory.h @@ -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" diff --git a/include/wx/dcprint.h b/include/wx/dcprint.h index 337207ebda..12792fd553 100644 --- a/include/wx/dcprint.h +++ b/include/wx/dcprint.h @@ -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" diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h index c6a65fc720..97fe316b8d 100644 --- a/include/wx/dcscreen.h +++ b/include/wx/dcscreen.h @@ -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" diff --git a/include/wx/defs.h b/include/wx/defs.h index 6c9931e482..11d1711a22 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -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 diff --git a/include/wx/dialog.h b/include/wx/dialog.h index ce21810e37..855ce352c8 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -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" diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h index e399597117..82d812846d 100644 --- a/include/wx/encinfo.h +++ b/include/wx/encinfo.h @@ -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__) || \ diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h index 07ba0008e0..cb2de4ac71 100644 --- a/include/wx/evtloop.h +++ b/include/wx/evtloop.h @@ -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" diff --git a/include/wx/filefn.h b/include/wx/filefn.h index d112029e3b..2428a97d29 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -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 diff --git a/include/wx/font.h b/include/wx/font.h index b8d436bb9c..dc03888f75 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -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" diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h index 3e485e569a..e944c158e7 100644 --- a/include/wx/fontutil.h +++ b/include/wx/fontutil.h @@ -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 diff --git a/include/wx/frame.h b/include/wx/frame.h index 9b857d9f4b..ed865ea94f 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -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" diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h index ad84296999..d7f5d46377 100644 --- a/include/wx/gdiobj.h +++ b/include/wx/gdiobj.h @@ -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" diff --git a/include/wx/help.h b/include/wx/help.h index 20cea7fc26..5ea82acabd 100644 --- a/include/wx/help.h +++ b/include/wx/help.h @@ -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 diff --git a/include/wx/icon.h b/include/wx/icon.h index c0af6c26c2..4b7218e158 100644 --- a/include/wx/icon.h +++ b/include/wx/icon.h @@ -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" diff --git a/include/wx/menu.h b/include/wx/menu.h index 79dd28ef61..ba9f52ea93 100644 --- a/include/wx/menu.h +++ b/include/wx/menu.h @@ -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" diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h index dd3af54c3b..bdf8f5428f 100644 --- a/include/wx/menuitem.h +++ b/include/wx/menuitem.h @@ -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" diff --git a/include/wx/metafile.h b/include/wx/metafile.h index ad4053a648..5f2ad07373 100644 --- a/include/wx/metafile.h +++ b/include/wx/metafile.h @@ -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" diff --git a/include/wx/minifram.h b/include/wx/minifram.h index 0a8bd8c307..b90587ce22 100644 --- a/include/wx/minifram.h +++ b/include/wx/minifram.h @@ -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" diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h index 4a9c57af73..0223e29115 100644 --- a/include/wx/msgdlg.h +++ b/include/wx/msgdlg.h @@ -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" diff --git a/include/wx/palette.h b/include/wx/palette.h index 91c1f52945..30aa385cbf 100644 --- a/include/wx/palette.h +++ b/include/wx/palette.h @@ -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" diff --git a/include/wx/palmos/app.h b/include/wx/palmos/app.h index 7e2c362e08..d9527d5771 100644 --- a/include/wx/palmos/app.h +++ b/include/wx/palmos/app.h @@ -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 #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_ diff --git a/include/wx/palmos/bitmap.h b/include/wx/palmos/bitmap.h index 9e7ab124a3..e51588aee4 100644 --- a/include/wx/palmos/bitmap.h +++ b/include/wx/palmos/bitmap.h @@ -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) }; diff --git a/include/wx/palmos/button.h b/include/wx/palmos/button.h index 07f4ed15f9..73c7c97750 100644 --- a/include/wx/palmos/button.h +++ b/include/wx/palmos/button.h @@ -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 diff --git a/include/wx/palmos/chkconf.h b/include/wx/palmos/chkconf.h index 3f274cee63..d172c90ba6 100644 --- a/include/wx/palmos/chkconf.h +++ b/include/wx/palmos/chkconf.h @@ -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_ */ diff --git a/include/wx/palmos/dragimag.h b/include/wx/palmos/dragimag.h index 1a934527f1..a522400c25 100644 --- a/include/wx/palmos/dragimag.h +++ b/include/wx/palmos/dragimag.h @@ -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 diff --git a/include/wx/palmos/enhmeta.h b/include/wx/palmos/enhmeta.h index 3613bcb9ea..e502b076c2 100644 --- a/include/wx/palmos/enhmeta.h +++ b/include/wx/palmos/enhmeta.h @@ -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 /////////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/palmos/font.h b/include/wx/palmos/font.h index 024a9380f9..8a543f2c5c 100644 --- a/include/wx/palmos/font.h +++ b/include/wx/palmos/font.h @@ -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, diff --git a/include/wx/palmos/gccpriv.h b/include/wx/palmos/gccpriv.h index a7ec8e86a6..e8598e78cd 100644 --- a/include/wx/palmos/gccpriv.h +++ b/include/wx/palmos/gccpriv.h @@ -4,6 +4,9 @@ #ifndef _WX_MSW_GCCPRIV_H_ #define _WX_MSW_GCCPRIV_H_ +#include +#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 diff --git a/include/wx/palmos/menu.h b/include/wx/palmos/menu.h index 94f424000d..d54a5a1472 100644 --- a/include/wx/palmos/menu.h +++ b/include/wx/palmos/menu.h @@ -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) diff --git a/include/wx/palmos/mslu.h b/include/wx/palmos/mslu.h index 176a3d5120..3333f4627b 100644 --- a/include/wx/palmos/mslu.h +++ b/include/wx/palmos/mslu.h @@ -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_ diff --git a/include/wx/palmos/popupwin.h b/include/wx/palmos/popupwin.h index beaced311e..a50339e8ae 100644 --- a/include/wx/palmos/popupwin.h +++ b/include/wx/palmos/popupwin.h @@ -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 diff --git a/include/wx/palmos/registry.h b/include/wx/palmos/registry.h index 8bd2165fee..68b15921d9 100644 --- a/include/wx/palmos/registry.h +++ b/include/wx/palmos/registry.h @@ -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; diff --git a/include/wx/palmos/textctrl.h b/include/wx/palmos/textctrl.h index e12608bc79..e6f8f5ba1e 100644 --- a/include/wx/palmos/textctrl.h +++ b/include/wx/palmos/textctrl.h @@ -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; diff --git a/include/wx/palmos/toplevel.h b/include/wx/palmos/toplevel.h index 64577fa230..7ab2aca2ac 100644 --- a/include/wx/palmos/toplevel.h +++ b/include/wx/palmos/toplevel.h @@ -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 -#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, diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h index d082d31ad1..230bcbdff2 100644 --- a/include/wx/palmos/window.h +++ b/include/wx/palmos/window.h @@ -12,11 +12,6 @@ #ifndef _WX_WINDOW_H_ #define _WX_WINDOW_H_ -#ifdef __PALMOS__ - #include -#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); diff --git a/include/wx/pen.h b/include/wx/pen.h index f700e98879..00634869e7 100644 --- a/include/wx/pen.h +++ b/include/wx/pen.h @@ -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" diff --git a/include/wx/platform.h b/include/wx/platform.h index 03ae258679..bd30bf68f2 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -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 */ diff --git a/include/wx/region.h b/include/wx/region.h index a92ccce90b..7dad80a147 100644 --- a/include/wx/region.h +++ b/include/wx/region.h @@ -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" diff --git a/include/wx/renderer.h b/include/wx/renderer.h index 271f19dcad..5ccc505658 100644 --- a/include/wx/renderer.h +++ b/include/wx/renderer.h @@ -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 diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h index d60562e139..13edd15157 100644 --- a/include/wx/statusbr.h +++ b/include/wx/statusbr.h @@ -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" diff --git a/include/wx/string.h b/include/wx/string.h index bd343a081d..a2c14c11fb 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -51,7 +51,7 @@ #include // for strcasecmp() #endif // HAVE_STRCASECMP_IN_STRINGS_H -#ifdef __PALMOS__ +#ifdef __WXPALMOS__ #include #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); } diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h index 97f912ceb8..efc3c4d571 100644 --- a/include/wx/taskbar.h +++ b/include/wx/taskbar.h @@ -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" diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h index a830694c78..d8ab15b831 100644 --- a/include/wx/toolbar.h +++ b/include/wx/toolbar.h @@ -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" diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index a3821d3199..64e9384a99 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -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__) diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h index 5d3c03aa8b..228194f8fa 100644 --- a/include/wx/treectrl.h +++ b/include/wx/treectrl.h @@ -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" diff --git a/include/wx/window.h b/include/wx/window.h index 47e9d653e1..ffa36e365e 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -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 diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 82abd84a45..fdfb0da05f 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -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 #include @@ -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 @@ -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 //for mem funcs - + //implement our own wmem variants inline wxChar* wxTmemchr(const wxChar* s, wxChar c, size_t l) { diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp index 1a13c3f339..5c89543509 100644 --- a/src/common/appbase.cpp +++ b/src/common/appbase.cpp @@ -43,7 +43,7 @@ #include // for SIGTRAP used by wxTrap() #endif //Win/Unix -#if defined(__WXMSW__) && !defined(__PALMOS__) +#if defined(__WXMSW__) && !defined(__WXPALMOS__) #include "wx/msw/wrapwin.h" // includes windows.h for MessageBox() #endif @@ -140,7 +140,7 @@ bool wxAppConsole::Initialize(int& argc, wxChar **argv) this->argc = argc; this->argv = argv; -#ifndef __PALMOS__ +#ifndef __WXPALMOS__ if ( m_appName.empty() && argv ) { // the application name is, by default, the name of its executable file diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index 4b5a93d453..009f9dcf69 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -47,7 +47,7 @@ #include "wx/utils.h" #include "wx/ptr_scpd.h" -#if defined(__WXMSW__) && !defined(__PALMOS__) +#if defined(__WXMSW__) && !defined(__WXPALMOS__) #include "wx/msw/private.h" // includes windows.h for LOGFONT #endif @@ -139,7 +139,7 @@ void wxAppBase::CleanUp() // but we want to delete them now delete wxTopLevelWindows.GetFirst()->GetData(); } - + // undo everything we did in Initialize() above wxBitmap::CleanUpHandlers(); diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp index 37e2d98304..c2208533aa 100644 --- a/src/common/cmndata.cpp +++ b/src/common/cmndata.cpp @@ -49,7 +49,7 @@ #include "wx/paper.h" #endif // wxUSE_PRINTING_ARCHITECTURE -#if defined(__WXMSW__) && !defined(__PALMOS__) +#if defined(__WXMSW__) && !defined(__WXPALMOS__) #include #include "wx/msw/private.h" @@ -197,9 +197,9 @@ wxPrintData::wxPrintData(const wxPrintData& printData) wxPrintData::~wxPrintData() { m_nativeData->m_ref--; - if (m_nativeData->m_ref == 0) + if (m_nativeData->m_ref == 0) delete m_nativeData; - + #ifdef __WXMAC__ delete m_nativePrintData ; #endif @@ -236,19 +236,19 @@ void wxPrintData::operator=(const wxPrintData& data) m_paperSize = data.m_paperSize; m_bin = data.m_bin; m_printMode = data.m_printMode; - m_filename = data.m_filename; + m_filename = data.m_filename; - // UnRef old m_nativeData + // UnRef old m_nativeData if (m_nativeData) { m_nativeData->m_ref--; - if (m_nativeData->m_ref == 0) + if (m_nativeData->m_ref == 0) delete m_nativeData; } // Set Ref new one m_nativeData = data.GetNativeData(); m_nativeData->m_ref++; - + #ifdef __WXMAC__ m_nativePrintData->CopyFrom( data.m_nativePrintData ) ; #endif @@ -444,10 +444,10 @@ wxPrintDialogData::wxPrintDialogData() m_printSelection = false; m_printEnableSelection = false; m_printEnablePageNumbers = true; - + wxPrintFactory* factory = wxPrintFactory::GetFactory(); m_printEnablePrintToFile = ! factory->HasOwnPrintToFile(); - + m_printEnableHelp = false; #if WXWIN_COMPATIBILITY_2_4 m_printSetupDialog = false; diff --git a/src/common/containr.cpp b/src/common/containr.cpp index 5bfc812f78..8b62297a92 100644 --- a/src/common/containr.cpp +++ b/src/common/containr.cpp @@ -291,7 +291,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) wxWindow *child = node->GetData(); -#if defined(__WXMSW__) && !defined(__PALMOS__) +#if defined(__WXMSW__) && !defined(__WXPALMOS__) bool is_not_msw_rb = !m_winLastFocused || !wxIsKindOf(m_winLastFocused,wxRadioButton); #else @@ -306,7 +306,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) // direction we're coming event.SetEventObject(m_winParent); -#if defined(__WXMSW__) && !defined(__PALMOS__) +#if defined(__WXMSW__) && !defined(__WXPALMOS__) // we need to hop to the next activated // radio button, not just the next radio // button under MSW diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index dcb846f6f5..666585f368 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -36,7 +36,7 @@ #include "wx/gdicmn.h" -#if defined(__WXMSW__) && !defined(__PALMOS__) +#if defined(__WXMSW__) && !defined(__WXPALMOS__) #include "wx/msw/private.h" // includes windows.h for LOGFONT #include "wx/msw/winundef.h" #endif diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 0f73fff839..49df9a3f89 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -42,7 +42,7 @@ #include "wx/log.h" #include -#if defined(__WXMSW__) && !defined(__PALMOS__) +#if defined(__WXMSW__) && !defined(__WXPALMOS__) #include "wx/msw/wrapwin.h" #endif diff --git a/src/common/init.cpp b/src/common/init.cpp index 459d37a7cc..67112ab050 100644 --- a/src/common/init.cpp +++ b/src/common/init.cpp @@ -433,7 +433,7 @@ int wxEntry(int& argc, wxChar **argv) { #ifdef __WXWINCE__ ::ExitThread(3); // the same exit code as abort() -#elif __PALMOS__ +#elif __WXPALMOS__ return -1; #else ::ExitProcess(3); // the same exit code as abort() diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index 348f6ae1dd..54cd442fa1 100755 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -52,7 +52,7 @@ #include #include -#if defined(__WXMSW__) && !defined(__PALMOS__) +#if defined(__WXMSW__) && !defined(__WXPALMOS__) #include "wx/msw/private.h" #endif #ifdef __WXMAC__ @@ -118,7 +118,7 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...) out.PrintfV(format, args); va_end(args); -#if defined(__WXMSW__) && !defined(__WXMICROWIN__) && !defined(__PALMOS__) +#if defined(__WXMSW__) && !defined(__WXMICROWIN__) && !defined(__WXPALMOS__) out.Replace(wxT("\t"), wxT(" ")); out.Replace(wxT("\n"), wxT("\r\n")); ::OutputDebugString(out); diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp index b741896ab6..a09bbd5cce 100644 --- a/src/common/textbuf.cpp +++ b/src/common/textbuf.cpp @@ -43,7 +43,7 @@ // - Mac when compiling with CodeWarrior (__WXMAC__) const wxTextFileType wxTextBuffer::typeDefault = -#if defined(__WINDOWS__) || defined(__DOS__) +#if defined(__WINDOWS__) || defined(__DOS__) || defined(__PALMOS__) wxTextFileType_Dos; #elif defined(__UNIX__) wxTextFileType_Unix; @@ -77,7 +77,7 @@ wxString wxTextBuffer::Translate(const wxString& text, wxTextFileType type) return text; // nor if it is empty - if ( text.IsEmpty() ) + if ( text.empty() ) return text; wxString eol = GetEOL(type), result; @@ -170,7 +170,7 @@ bool wxTextBuffer::Create(const wxString& strBufferName) bool wxTextBuffer::Create() { // buffer name must be either given in ctor or in Create(const wxString&) - wxASSERT( !m_strBufferName.IsEmpty() ); + wxASSERT( !m_strBufferName.empty() ); // if the buffer already exists do nothing if ( Exists() ) return false; @@ -192,7 +192,7 @@ bool wxTextBuffer::Open(const wxString& strBufferName, wxMBConv& conv) bool wxTextBuffer::Open(wxMBConv& conv) { // buffer name must be either given in ctor or in Open(const wxString&) - wxASSERT( !m_strBufferName.IsEmpty() ); + wxASSERT( !m_strBufferName.empty() ); // open buffer in read-only mode if ( !OnOpen(m_strBufferName, ReadAccess) ) diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 02c4774c93..f1fc29b1db 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -95,7 +95,7 @@ #include #endif -#if defined(__WXMSW__) && !defined(__PALMOS__) +#if defined(__WXMSW__) && !defined(__WXPALMOS__) #include "wx/msw/private.h" #endif @@ -330,10 +330,10 @@ wxString wxGetEmailAddress() wxString email; wxString host = wxGetFullHostName(); - if ( !host.IsEmpty() ) + if ( !host.empty() ) { wxString user = wxGetUserId(); - if ( !user.IsEmpty() ) + if ( !user.empty() ) { email << user << wxT('@') << host; } diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index 23fb6cee97..06ab88e919 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -20,7 +20,7 @@ #include "wx/defs.h" -#ifndef __PALMOS__ +#ifndef __WXPALMOS__ #include "wx/generic/imaglist.h" @@ -195,4 +195,4 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y, return true; } -#endif // __PALMOS__ +#endif // __WXPALMOS__ diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp index 19b7b08a51..69f7bdd794 100644 --- a/src/generic/notebook.cpp +++ b/src/generic/notebook.cpp @@ -17,8 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifndef __PALMOS__ - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "notebook.h" #endif @@ -34,6 +32,8 @@ #pragma hdrstop #endif +#ifndef __WXPALMOS__ + #include "wx/string.h" #include "wx/log.h" #include "wx/settings.h" @@ -708,4 +708,4 @@ bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId) return retval; } -#endif // __PALMOS__ +#endif // __WXPALMOS__ diff --git a/src/palmos/app.cpp b/src/palmos/app.cpp index c66d9f24e5..8c84faae12 100644 --- a/src/palmos/app.cpp +++ b/src/palmos/app.cpp @@ -4,7 +4,7 @@ // Author: William Osborne // Modified by: // Created: 10/08/04 -// RCS-ID: $Id: +// RCS-ID: $Id: // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -127,8 +127,8 @@ wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() info.versionMajor = baseInfo.versionMajor; info.versionMinor = baseInfo.versionMinor; info.os = baseInfo.os; - info.shortName = _T("msw"); - info.name = _T("wxMSW"); + info.shortName = _T("palmos"); + info.name = _T("wxPalmOS"); #ifdef __WXUNIVERSAL__ info.shortName << _T("univ"); info.name << _T("/wxUniversal"); @@ -193,7 +193,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) // to create a window of this class is made. bool wxApp::RegisterWindowClasses() { - return TRUE; + return true; } // --------------------------------------------------------------------------- @@ -202,7 +202,7 @@ bool wxApp::RegisterWindowClasses() bool wxApp::UnregisterWindowClasses() { - bool retval = TRUE; + bool retval = true; return retval; } @@ -268,7 +268,7 @@ void wxApp::WakeUpIdle() void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event)) { if (GetTopWindow()) - GetTopWindow()->Close(TRUE); + GetTopWindow()->Close(true); } // Default behaviour: close the application with prompts. The @@ -278,7 +278,7 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) if (GetTopWindow()) { if (!GetTopWindow()->Close(!event.CanVeto())) - event.Veto(TRUE); + event.Veto(true); } } diff --git a/src/palmos/bitmap.cpp b/src/palmos/bitmap.cpp index 06dff74aa2..77bf3659f6 100644 --- a/src/palmos/bitmap.cpp +++ b/src/palmos/bitmap.cpp @@ -4,7 +4,7 @@ // Author: William Osborne // Modified by: // Created: 10/08/04 -// RCS-ID: $Id: +// RCS-ID: $Id: // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -166,7 +166,7 @@ wxBitmapRefData::wxBitmapRefData() #endif m_isDIB = - m_hasAlpha = FALSE; + m_hasAlpha = false; } void wxBitmapRefData::Free() @@ -187,30 +187,21 @@ wxGDIImageRefData *wxBitmap::CreateData() const return NULL; } -#ifdef __WIN32__ - -bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon) -{ - return FALSE; -} - -#endif // Win32 - bool wxBitmap::CopyFromCursor(const wxCursor& cursor) { - return FALSE; + return false; } bool wxBitmap::CopyFromIcon(const wxIcon& icon) { - return FALSE; + return false; } #ifndef NEVER_USE_DIB bool wxBitmap::CopyFromDIB(const wxDIB& dib) { - return FALSE: + return false: } #endif // NEVER_USE_DIB @@ -231,7 +222,7 @@ bool wxBitmap::CreateFromXpm(const char **data) bool wxBitmap::CreateFromXpm(const char **WXUNUSED(data)) #endif { - return FALSE; + return false; } wxBitmap::wxBitmap(int w, int h, int d) @@ -252,17 +243,17 @@ wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type) bool wxBitmap::Create(int width, int height, int depth) { - return FALSE; + return false; } bool wxBitmap::Create(int width, int height, const wxDC& dc) { - return FALSE; + return false; } bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc) { - return FALSE; + return false; } #if wxUSE_IMAGE @@ -275,17 +266,17 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc) bool wxBitmap::CreateFromImage(const wxImage& image, int depth) { - return FALSE; + return false; } bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc) { - return FALSE; + return false; } bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc) { - return FALSE; + return false; } wxImage wxBitmap::ConvertToImage() const @@ -304,19 +295,19 @@ wxImage wxBitmap::ConvertToImage() const bool wxBitmap::LoadFile(const wxString& filename, long type) { - return FALSE; + return false; } bool wxBitmap::Create(void *data, long type, int width, int height, int depth) { - return FALSE; + return false; } bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette) { - return FALSE; + return false; } // ---------------------------------------------------------------------------- @@ -369,7 +360,7 @@ void wxBitmap::UseAlpha() bool wxBitmap::HasAlpha() const { - return FALSE; + return false; } // ---------------------------------------------------------------------------- @@ -453,21 +444,21 @@ wxMask::~wxMask() // Create a mask from a mono bitmap (copies the bitmap). bool wxMask::Create(const wxBitmap& bitmap) { - return FALSE; + return false; } // Create a mask from a bitmap and a palette index indicating // the transparent area bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex) { - return FALSE; + return false; } // Create a mask from a bitmap and a colour indicating // the transparent area bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) { - return FALSE; + return false; } // ---------------------------------------------------------------------------- @@ -479,7 +470,7 @@ bool wxBitmapHandler::Create(wxGDIImage *image, long flags, int width, int height, int depth) { - return FALSE; + return false; } bool wxBitmapHandler::Load(wxGDIImage *image, @@ -487,14 +478,14 @@ bool wxBitmapHandler::Load(wxGDIImage *image, long flags, int width, int height) { - return FALSE; + return false; } bool wxBitmapHandler::Save(wxGDIImage *image, const wxString& name, int type) { - return FALSE; + return false; } bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap), @@ -504,7 +495,7 @@ bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap), int WXUNUSED(height), int WXUNUSED(depth)) { - return FALSE; + return false; } bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap), @@ -513,7 +504,7 @@ bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap), int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) { - return FALSE; + return false; } bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap), @@ -521,5 +512,5 @@ bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap), int WXUNUSED(type), const wxPalette *WXUNUSED(palette)) { - return FALSE; + return false; } diff --git a/src/palmos/button.cpp b/src/palmos/button.cpp index fdaf6f2570..33edcfd45c 100644 --- a/src/palmos/button.cpp +++ b/src/palmos/button.cpp @@ -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,7 +59,7 @@ wxBEGIN_FLAGS( wxButtonStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -199,50 +199,5 @@ bool wxButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) return false; } -// ---------------------------------------------------------------------------- -// owner-drawn buttons support -// ---------------------------------------------------------------------------- - -#ifdef __WIN32__ - -// drawing helpers - -static void DrawButtonText(HDC hdc, - RECT *pRect, - const wxString& text, - COLORREF col) -{ -} - -static void DrawRect(HDC hdc, const RECT& r) -{ -} - -void wxButton::MakeOwnerDrawn() -{ -} - -bool wxButton::SetBackgroundColour(const wxColour &colour) -{ - return false; -} - -bool wxButton::SetForegroundColour(const wxColour &colour) -{ - return false; -} - -static void DrawButtonFrame(HDC hdc, const RECT& rectBtn, - bool selected, bool pushed) -{ -} - -bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis) -{ - return true; -} - -#endif // __WIN32__ - #endif // wxUSE_BUTTON diff --git a/src/palmos/dialup.cpp b/src/palmos/dialup.cpp index c78dc6b4b3..ae80a8ac83 100644 --- a/src/palmos/dialup.cpp +++ b/src/palmos/dialup.cpp @@ -42,9 +42,9 @@ DEFINE_EVENT_TYPE(wxEVT_DIALUP_CONNECTED) DEFINE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED) -// This needs to be written using Palm OS Network API calls, but for now this +// This needs to be written using Palm OS Network API calls, but for now this // will do. -#if (!defined(__PALMOS__) +#if (!defined(__WXPALMOS__) #include #include @@ -175,7 +175,7 @@ public: virtual bool HangUp(); virtual bool IsAlwaysOnline() const; virtual bool IsOnline() const; - virtual void SetOnlineStatus(bool isOnline = TRUE); + virtual void SetOnlineStatus(bool isOnline = true); virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds); virtual void DisableAutoCheckOnlineStatus(); virtual void SetWellKnownHost(const wxString& hostname, int port); @@ -201,7 +201,7 @@ private: static HRASCONN FindActiveConnection(); // notify the application about status change - void NotifyApp(bool connected, bool fromOurselves = FALSE) const; + void NotifyApp(bool connected, bool fromOurselves = false) const; // destroy the thread data and the thread itself void CleanUpThreadData(); @@ -626,14 +626,14 @@ void wxDialUpManagerMSW::OnDialProgress(RASCONNSTATE rasconnstate, ms_dialer = NULL; - NotifyApp(FALSE /* !connected */, TRUE /* we dialed ourselves */); + NotifyApp(false /* !connected */, true /* we dialed ourselves */); } else if ( rasconnstate == RASCS_Connected ) { ms_isConnected = TRUE; ms_dialer = NULL; - NotifyApp(TRUE /* connected */, TRUE /* we dialed ourselves */); + NotifyApp(true /* connected */, true /* we dialed ourselves */); } } @@ -703,13 +703,13 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP, bool async) { // check preconditions - wxCHECK_MSG( IsOk(), FALSE, wxT("using uninitialized wxDialUpManager") ); + wxCHECK_MSG( IsOk(), false, wxT("using uninitialized wxDialUpManager") ); if ( ms_hRasConnection ) { wxFAIL_MSG(wxT("there is already an active connection")); - return TRUE; + return true; } // get the default ISP if none given @@ -724,7 +724,7 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP, // no known ISPs, abort wxLogError(_("Failed to connect: no ISP to dial.")); - return FALSE; + return false; case 1: // only one ISP, choose it @@ -753,7 +753,7 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP, if ( !entryName ) { // cancelled by user - return FALSE; + return false; } } } @@ -778,7 +778,7 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP, { wxLogError(_("Failed to connect: missing username/password.")); - return FALSE; + return false; } } else @@ -849,7 +849,7 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP, ms_dialer = NULL; - return FALSE; + return false; } // for async dialing, we're not yet connected @@ -858,7 +858,7 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP, ms_isConnected = TRUE; } - return TRUE; + return true; } bool wxDialUpManagerMSW::IsDialing() const @@ -871,7 +871,7 @@ bool wxDialUpManagerMSW::CancelDialing() if ( !GetDialer() ) { // silently ignore - return FALSE; + return false; } wxASSERT_MSG( ms_hRasConnection, wxT("dialing but no connection?") ); @@ -883,7 +883,7 @@ bool wxDialUpManagerMSW::CancelDialing() bool wxDialUpManagerMSW::HangUp() { - wxCHECK_MSG( IsOk(), FALSE, wxT("using uninitialized wxDialUpManager") ); + wxCHECK_MSG( IsOk(), false, wxT("using uninitialized wxDialUpManager") ); // we may terminate either the connection we initiated or another one which // is active now @@ -903,7 +903,7 @@ bool wxDialUpManagerMSW::HangUp() { wxLogError(_("Cannot hang up - no active dialup connection.")); - return FALSE; + return false; } DWORD dwRet = ms_pfnRasHangUp(hRasConn); @@ -915,13 +915,13 @@ bool wxDialUpManagerMSW::HangUp() ms_isConnected = FALSE; - return TRUE; + return true; } bool wxDialUpManagerMSW::IsAlwaysOnline() const { // assume no permanent connection by default - bool isAlwaysOnline = FALSE; + bool isAlwaysOnline = false; // try to use WinInet functions @@ -958,7 +958,7 @@ bool wxDialUpManagerMSW::IsAlwaysOnline() const bool wxDialUpManagerMSW::IsOnline() const { - wxCHECK_MSG( IsOk(), FALSE, wxT("using uninitialized wxDialUpManager") ); + wxCHECK_MSG( IsOk(), false, wxT("using uninitialized wxDialUpManager") ); if ( IsAlwaysOnline() ) { @@ -973,7 +973,7 @@ bool wxDialUpManagerMSW::IsOnline() const } else { - // return TRUE if there is at least one active connection + // return true if there is at least one active connection return FindActiveConnection() != 0; } } @@ -987,12 +987,12 @@ void wxDialUpManagerMSW::SetOnlineStatus(bool isOnline) bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds) { - wxCHECK_MSG( IsOk(), FALSE, wxT("using uninitialized wxDialUpManager") ); + wxCHECK_MSG( IsOk(), false, wxT("using uninitialized wxDialUpManager") ); if ( m_autoCheckLevel++ ) { // already checking - return TRUE; + return true; } bool ok = ms_pfnRasConnectionNotification != 0; @@ -1006,12 +1006,12 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds) if ( m_hThread != 0 ) { if ( ::ResumeThread(m_hThread) != (DWORD)-1 ) - return TRUE; + return true; // we're leaving a zombie thread... but what else can we do? wxLogLastError(wxT("ResumeThread(RasThread)")); - ok = FALSE; + ok = false; } } @@ -1032,7 +1032,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds) { wxLogLastError(wxT("CreateEvent(RasStatus)")); - ok = FALSE; + ok = false; } } @@ -1055,7 +1055,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds) CleanUpThreadData(); - ok = FALSE; + ok = false; } } @@ -1074,7 +1074,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds) CleanUpThreadData(); - ok = FALSE; + ok = false; } // and subclass it @@ -1126,7 +1126,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds) } else { - return TRUE; + return true; } } @@ -1140,7 +1140,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds) } m_timerStatusPolling.Start(nSeconds * 1000); - return TRUE; + return true; } void wxDialUpManagerMSW::DisableAutoCheckOnlineStatus() @@ -1198,7 +1198,7 @@ static DWORD wxRasMonitorThread(wxRasThreadData *data) handles[0] = data->hEventRas; handles[1] = data->hEventQuit; - bool cont = TRUE; + bool cont = true; while ( cont ) { DWORD dwRet = WaitForMultipleObjects(2, handles, FALSE, INFINITE); @@ -1212,7 +1212,7 @@ static DWORD wxRasMonitorThread(wxRasThreadData *data) break; case WAIT_OBJECT_0 + 1: - cont = FALSE; + cont = false; break; default: @@ -1284,7 +1284,7 @@ static void WINAPI wxRasDialFunc(UINT WXUNUSED(unMsg), rasconnstate, dwError); } -#endif // __PALMOS__ +#endif // __WXPALMOS__ #endif // wxUSE_DIALUP_MANAGER diff --git a/src/palmos/dir.cpp b/src/palmos/dir.cpp index 5bde0b1d19..dfb9931e4c 100644 --- a/src/palmos/dir.cpp +++ b/src/palmos/dir.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: palmos/dir.cpp -// Purpose: wxDir implementation for Win32 +// Purpose: wxDir implementation for PalmOS // Author: William Osborne // Modified by: // Created: 10.13.04 -// RCS-ID: $Id: +// RCS-ID: $Id: // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/palmos/font.cpp b/src/palmos/font.cpp index ad4f75ec74..3fa24740e9 100644 --- a/src/palmos/font.cpp +++ b/src/palmos/font.cpp @@ -4,7 +4,7 @@ // Author: William Osborne // Modified by: // Created: 10/14/04 -// RCS-ID: $Id: +// RCS-ID: $Id: // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -103,8 +103,8 @@ public: // constructors wxFontRefData() { - Init(-1, wxSize(0, 0), FALSE, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, - wxFONTWEIGHT_NORMAL, FALSE, wxEmptyString, + Init(-1, wxSize(0, 0), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, + wxFONTWEIGHT_NORMAL, false, wxEmptyString, wxFONTENCODING_DEFAULT); } @@ -218,7 +218,7 @@ public: else { m_pointSize = pointSize; - m_sizeUsingPixels = FALSE; + m_sizeUsingPixels = false; } } @@ -231,7 +231,7 @@ public: else { m_pixelSize = pixelSize; - m_sizeUsingPixels = TRUE; + m_sizeUsingPixels = true; } } @@ -394,7 +394,7 @@ bool wxFont::DoCreate(int pointSize, const wxString& faceName, wxFontEncoding encoding) { - return false; + return false; } wxFont::~wxFont() @@ -407,7 +407,7 @@ wxFont::~wxFont() bool wxFont::RealizeResource() { - return false; + return false; } bool wxFont::FreeResource(bool WXUNUSED(force)) @@ -420,11 +420,6 @@ WXHANDLE wxFont::GetResourceHandle() const return (WXHANDLE)0; } -WXHFONT wxFont::GetHFONT() const -{ - return 0; -} - bool wxFont::IsFree() const { return false; diff --git a/src/palmos/joystick.cpp b/src/palmos/joystick.cpp index ac874f113d..7fb42f228c 100644 --- a/src/palmos/joystick.cpp +++ b/src/palmos/joystick.cpp @@ -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 ///////////////////////////////////////////////////////////////////////////// @@ -21,12 +21,6 @@ #endif #include "wx/string.h" -#include "wx/window.h" - -#if !defined(__WIN32__) && !defined(_MMRESULT_) -typedef UINT MMRESULT; -#endif - #include "wx/window.h" #include "wx/palmos/joystick.h" diff --git a/src/palmos/menu.cpp b/src/palmos/menu.cpp index e5177ca4da..a1d5f3be61 100644 --- a/src/palmos/menu.cpp +++ b/src/palmos/menu.cpp @@ -4,7 +4,7 @@ // Author: William Osborne // Modified by: // Created: 10/12/04 -// RCS-ID: $Id: +// RCS-ID: $Id: // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -45,10 +45,7 @@ // other standard headers #include -#ifdef __PALMOS__ - #include - #include -#endif +#include // ---------------------------------------------------------------------------- // global variables @@ -128,7 +125,7 @@ wxEND_PROPERTIES_TABLE() wxBEGIN_HANDLERS_TABLE(wxMenuInfo) wxEND_HANDLERS_TABLE() -wxCONSTRUCTOR_2( wxMenuInfo , wxMenu* , Menu , wxString , Title ) +wxCONSTRUCTOR_2( wxMenuInfo , wxMenu* , Menu , wxString , Title ) wxCOLLECTION_TYPE_INFO( wxMenuInfo * , wxMenuInfoList ) ; @@ -206,11 +203,11 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) { if ( IsAttached() && GetMenuBar()->IsAttached() ) { - // Regenerate the menu resource + // Regenerate the menu resource GetMenuBar()->Refresh(); } - - return TRUE; + + return true; } void wxMenu::EndRadioGroup() @@ -227,11 +224,11 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item) } else if(IsAttached() && GetMenuBar()->IsAttached()) { - // Regenerate the menu resource + // Regenerate the menu resource GetMenuBar()->Refresh(); } - - return item; + + return item; } wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) @@ -239,7 +236,7 @@ wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) if (wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos)) return item; else - return NULL; + return NULL; } wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) @@ -260,13 +257,13 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) // remove the item from the menu wxMenuItem *ret=wxMenuBase::DoRemove(item); - + if ( IsAttached() && GetMenuBar()->IsAttached() ) { - // Regenerate the menu resource + // Regenerate the menu resource GetMenuBar()->Refresh(); } - + return ret; } @@ -301,7 +298,7 @@ void wxMenu::SetTitle(const wxString& label) if ( IsAttached() && GetMenuBar()->IsAttached() ) { - // Regenerate the menu resource + // Regenerate the menu resource GetMenuBar()->Refresh(); } } @@ -426,7 +423,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { if ( !wxMenuBarBase::Insert(pos, menu, title) ) - return FALSE; + return false; m_titles.Insert(wxStripMenuCodes(title), pos); @@ -436,13 +433,13 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) Refresh(); } - return TRUE; + return true; } bool wxMenuBar::Append(wxMenu *menu, const wxString& title) { if ( !wxMenuBarBase::Append(menu, title) ) - return FALSE; + return false; m_titles.Add(wxStripMenuCodes(title)); @@ -452,7 +449,7 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title) Refresh(); } - return TRUE; + return true; } wxMenu *wxMenuBar::Remove(size_t pos) @@ -484,17 +481,17 @@ int wxMenuBar::ProcessCommand(int ItemID) { if(!IsAttached()) return -1; - + int MenuNum=(ItemID/1000)-1; int ItemNum=(ItemID-(1000*(MenuNum+1))); - + // Should never happen, but it doesn't hurt to check anyway. if(MenuNum>GetMenuCount()) return -1; // Get the menu wxMenu *ActiveMenu=GetMenu(MenuNum); - + // Make sure this is a valid item. if(ItemNum>ActiveMenu->GetMenuItemCount()) return -1; @@ -506,45 +503,45 @@ int wxMenuBar::ProcessCommand(int ItemID) return ActiveID; } -/* Palm OS does not have good dynamic menu support. About all you can do with - * the standard API calls is to add new items to an existing drop-down menu and - * hide/show items in a drop-down menu. It is impossible to add, hide, or - * change the label on a drop-down menu. - * - * The easiest and simplest way around this limitation is to modify the Palm OS - * MenuBarType structure directly. This gives limited ability to change the - * label on a drop-down menu. I have not been able to find a safe way to add, +/* Palm OS does not have good dynamic menu support. About all you can do with + * the standard API calls is to add new items to an existing drop-down menu and + * hide/show items in a drop-down menu. It is impossible to add, hide, or + * change the label on a drop-down menu. + * + * The easiest and simplest way around this limitation is to modify the Palm OS + * MenuBarType structure directly. This gives limited ability to change the + * label on a drop-down menu. I have not been able to find a safe way to add, * delete, or resize drop-down menus in OS 6. - * + * * The following routine attempt to work around these limitations present in the - * Palm OS API to provide limited dynamic menu support. This solution is far + * Palm OS API to provide limited dynamic menu support. This solution is far * from perfect, but the only other option is to wait for PalmSource to add full * dynamic menu support, or to recreate the Palm OS menu system from scratch. - * + * * This system is limited in that no more than 4 drop-down menus are allowed per * menu bar, and the label for each drop-down menu is limited to 8 characters of * text. However, this menu system should work for most applications. - * - * Basically the menu routines select one of four menu bars, depending on - * whether or not the requested menu bar has one, two, three, or four drop-down + * + * Basically the menu routines select one of four menu bars, depending on + * whether or not the requested menu bar has one, two, three, or four drop-down * menus. - * - * These four "template" menu bars contain one, two, three, or four drop-down - * menus. Each menu has a dummy menu item attached to it to allow the Palm OS + * + * These four "template" menu bars contain one, two, three, or four drop-down + * menus. Each menu has a dummy menu item attached to it to allow the Palm OS * MenuAddItem function to add the real items. - * - * The labels on the drop-down menus are then replaced with the labels of the + * + * The labels on the drop-down menus are then replaced with the labels of the * real menus. - * - * The menu is then attached to the active window and the MenuAddItem API - * function is called to add the items to each drop-down menu. Finally, + * + * The menu is then attached to the active window and the MenuAddItem API + * function is called to add the items to each drop-down menu. Finally, * MenuHideItem is called to remove the dummy items from each drop-down menu. */ void wxMenuBar::LoadMenu() { int i=0; int j=0; - + // Handle to the currently running application database DmOpenRef AppDB; @@ -555,16 +552,16 @@ void wxMenuBar::LoadMenu() int NumMenus=GetMenuCount(); // Set up the pointers and handles - char *PalmOSMenuBarPtr; + char *PalmOSMenuBarPtr; MemHandle PalmOSMenuBar; - + // Load the menu template and set up the menu pointers if(NumMenus==1) { PalmOSMenuBar=DmGetResource(AppDB,'MBAR',1000); PalmOSMenuBarPtr=(char *)MemHandleLock(PalmOSMenuBar); - PalmOSMenuBarPtr+=74; + PalmOSMenuBarPtr+=74; } else if(NumMenus==2) { @@ -582,7 +579,7 @@ void wxMenuBar::LoadMenu() } else { - // We support a maximum of 4 menus, so make sure that do not create + // We support a maximum of 4 menus, so make sure that do not create // more than we can handle. NumMenus=4; @@ -591,14 +588,14 @@ void wxMenuBar::LoadMenu() PalmOSMenuBarPtr+=200; } - + // Set the proper names for the drop-down triggers. for(i=0;iGetMenuItemCount();j++) { wxMenuItem *CurrentItem=CurrentMenu->FindItemByPosition(j); wxString ItemLabel=CurrentItem->GetLabel(); - + if(CurrentItem->IsSeparator()==true) { char Separator=MenuSeparatorChar; @@ -649,7 +646,7 @@ void wxMenuBar::LoadMenu() MenuAddItem(((i*1000)+1000)+j-1,((i*1000)+1000)+j,0x00,ItemLabel); } } - + // Hide the dummy menu item, since we don't need it anymore. MenuHideItem(9000+i); } @@ -658,16 +655,9 @@ void wxMenuBar::LoadMenu() void wxMenuBar::Attach(wxFrame *frame) { wxMenuBarBase::Attach(frame); - - LoadMenu(); -} -#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)) -bool wxMenuBar::AddAdornments(long style) -{ - return false; + LoadMenu(); } -#endif void wxMenuBar::Detach() { diff --git a/src/palmos/metafile.cpp b/src/palmos/metafile.cpp index 475c50d7ad..7ae165b59a 100644 --- a/src/palmos/metafile.cpp +++ b/src/palmos/metafile.cpp @@ -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 ///////////////////////////////////////////////////////////////////////////// @@ -143,24 +143,6 @@ void wxMetafileDC::SetMapMode(int mode) // ---------------------------------------------------------------------------- // wxMakeMetafilePlaceable // ---------------------------------------------------------------------------- -#ifdef __WIN32__ -struct RECT32 -{ - short left; - short top; - short right; - short bottom; -}; - -struct mfPLACEABLEHEADER { - DWORD key; - short hmf; - RECT32 bbox; - WORD inch; - DWORD reserved; - WORD checksum; -}; -#else struct mfPLACEABLEHEADER { DWORD key; HANDLE hmf; @@ -169,7 +151,6 @@ struct mfPLACEABLEHEADER { DWORD reserved; WORD checksum; }; -#endif /* * Pass filename of existing non-placeable metafile, and bounding box. diff --git a/src/palmos/mimetype.cpp b/src/palmos/mimetype.cpp index 294fc87572..41dd012327 100644 --- a/src/palmos/mimetype.cpp +++ b/src/palmos/mimetype.cpp @@ -21,7 +21,7 @@ #endif // This really doesn't apply to Palm OS -#ifdef __PALMOS__ +#ifdef __WXPALMOS__ #if wxUSE_MIMETYPE @@ -40,11 +40,6 @@ #include "wx/dynarray.h" #include "wx/confbase.h" -#ifdef __WXMSW__ - #include "wx/palmos/registry.h" - #include "wx/palmos/private.h" -#endif // OS - #include "wx/palmos/mimetype.h" // other standard headers @@ -107,7 +102,7 @@ static bool CanonicalizeParams(wxString& command) void wxFileTypeImpl::Init(const wxString& strFileType, const wxString& ext) { // VZ: does it? (FIXME) - wxCHECK_RET( !ext.IsEmpty(), _T("needs an extension") ); + wxCHECK_RET( !ext.empty(), _T("needs an extension") ); if ( ext[0u] != wxT('.') ) { m_ext = wxT('.'); @@ -131,9 +126,9 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs, wxArrayString *commands, const wxFileType::MessageParameters& params) const { - wxCHECK_MSG( !m_ext.IsEmpty(), 0, _T("GetAllCommands() needs an extension") ); + wxCHECK_MSG( !m_ext.empty(), 0, _T("GetAllCommands() needs an extension") ); - if ( m_strFileType.IsEmpty() ) + if ( m_strFileType.empty() ) { // get it from the registry wxFileTypeImpl *self = wxConstCast(this, wxFileTypeImpl); @@ -195,11 +190,11 @@ bool wxFileTypeImpl::EnsureExtKeyExists() { wxLogError(_("Failed to create registry entry for '%s' files."), m_ext.c_str()); - return FALSE; + return false; } } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -284,7 +279,7 @@ wxFileTypeImpl::GetOpenCommand(wxString *openCmd, *openCmd = wxFileType::ExpandCommand(cmd, params); - return !openCmd->IsEmpty(); + return !openCmd->empty(); } bool @@ -296,7 +291,7 @@ wxFileTypeImpl::GetPrintCommand(wxString *printCmd, *printCmd = wxFileType::ExpandCommand(cmd, params); - return !printCmd->IsEmpty(); + return !printCmd->empty(); } // ---------------------------------------------------------------------------- @@ -306,17 +301,17 @@ wxFileTypeImpl::GetPrintCommand(wxString *printCmd, // TODO this function is half implemented bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions) { - if ( m_ext.IsEmpty() ) { + if ( m_ext.empty() ) { // the only way to get the list of extensions from the file type is to // scan through all extensions in the registry - too slow... - return FALSE; + return false; } else { extensions.Empty(); extensions.Add(m_ext); // it's a lie too, we don't return _all_ extensions... - return TRUE; + return true; } } @@ -336,12 +331,12 @@ bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const if ( !GetMimeType(&s) ) { - return FALSE; + return false; } mimeTypes.Clear(); mimeTypes.Add(s); - return TRUE; + return true; } @@ -366,7 +361,7 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const // index may be omitted, in which case BeforeLast(',') is empty and // AfterLast(',') is the whole string - if ( strFullPath.IsEmpty() ) { + if ( strFullPath.empty() ) { strFullPath = strIndex; strIndex = wxT("0"); } @@ -378,12 +373,12 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const iconLoc->SetIndex(wxAtoi(strIndex)); } - return TRUE; + return true; } } // no such file type or no value or incorrect icon entry - return FALSE; + return false; } bool wxFileTypeImpl::GetDescription(wxString *desc) const @@ -395,11 +390,11 @@ bool wxFileTypeImpl::GetDescription(wxString *desc) const if ( key.Open(wxRegKey::Read) ) { // it's the default value of the key if ( key.QueryValue(wxEmptyString, *desc) ) { - return TRUE; + return true; } } - return FALSE; + return false; } // helper function @@ -425,7 +420,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext) // suppress possible error messages wxLogNull nolog; - bool knownExtension = FALSE; + bool knownExtension = false; wxString strFileType; wxRegKey key(wxRegKey::HKCR, str); @@ -439,7 +434,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext) // this extension doesn't have a filetype, but it's known to the // system and may be has some other useful keys (open command or // content-type), so still return a file type object for it - knownExtension = TRUE; + knownExtension = true; } } @@ -654,11 +649,11 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd, const wxString& verb, bool WXUNUSED(overwriteprompt)) { - wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE, + wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false, _T("SetCommand() needs an extension and a verb") ); if ( !EnsureExtKeyExists() ) - return FALSE; + return false; wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb)); #if 0 @@ -683,7 +678,7 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd, #endif // wxUSE_GUI { // cancelled by user - return FALSE; + return false; } } #endif @@ -696,10 +691,10 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd, /* // no longer used bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig) { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetMimeType() needs extension") ); + wxCHECK_MSG( !m_ext.empty(), false, _T("SetMimeType() needs extension") ); if ( !EnsureExtKeyExists() ) - return FALSE; + return false; // VZ: is this really useful? (FIXME) wxString mimeType; @@ -722,13 +717,13 @@ bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig) bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index) { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetDefaultIcon() needs extension") ); - wxCHECK_MSG( !m_strFileType.IsEmpty(), FALSE, _T("File key not found") ); + wxCHECK_MSG( !m_ext.empty(), false, _T("SetDefaultIcon() needs extension") ); + wxCHECK_MSG( !m_strFileType.empty(), false, _T("File key not found") ); // the next line fails on a SMBshare, I think because it is case mangled -// wxCHECK_MSG( !wxFileExists(cmd), FALSE, _T("Icon file not found.") ); +// wxCHECK_MSG( !wxFileExists(cmd), false, _T("Icon file not found.") ); if ( !EnsureExtKeyExists() ) - return FALSE; + return false; wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon")); @@ -739,11 +734,11 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index) bool wxFileTypeImpl::SetDescription (const wxString& desc) { - wxCHECK_MSG( !m_strFileType.IsEmpty(), FALSE, _T("File key not found") ); - wxCHECK_MSG( !desc.IsEmpty(), FALSE, _T("No file description supplied") ); + wxCHECK_MSG( !m_strFileType.empty(), false, _T("File key not found") ); + wxCHECK_MSG( !desc.empty(), false, _T("No file description supplied") ); if ( !EnsureExtKeyExists() ) - return FALSE; + return false; wxRegKey rkey(wxRegKey::HKCR, m_strFileType ); @@ -757,15 +752,15 @@ bool wxFileTypeImpl::SetDescription (const wxString& desc) bool wxFileTypeImpl::Unassociate() { - bool result = TRUE; + bool result = true; if ( !RemoveOpenCommand() ) - result = FALSE; + result = false; if ( !RemoveDefaultIcon() ) - result = FALSE; + result = false; if ( !RemoveMimeType() ) - result = FALSE; + result = false; if ( !RemoveDescription() ) - result = FALSE; + result = false; /* //this might hold other keys, eg some have CSLID keys @@ -787,7 +782,7 @@ bool wxFileTypeImpl::RemoveOpenCommand() bool wxFileTypeImpl::RemoveCommand(const wxString& verb) { - wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE, + wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false, _T("RemoveCommand() needs an extension and a verb") ); wxString sKey = m_strFileType; @@ -799,7 +794,7 @@ bool wxFileTypeImpl::RemoveCommand(const wxString& verb) bool wxFileTypeImpl::RemoveMimeType() { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("RemoveMimeType() needs extension") ); + wxCHECK_MSG( !m_ext.empty(), false, _T("RemoveMimeType() needs extension") ); wxRegKey rkey(wxRegKey::HKCR, m_ext); return !rkey.Exists() || rkey.DeleteSelf(); @@ -807,7 +802,7 @@ bool wxFileTypeImpl::RemoveMimeType() bool wxFileTypeImpl::RemoveDefaultIcon() { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, + wxCHECK_MSG( !m_ext.empty(), false, _T("RemoveDefaultIcon() needs extension") ); wxRegKey rkey (wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon")); @@ -816,7 +811,7 @@ bool wxFileTypeImpl::RemoveDefaultIcon() bool wxFileTypeImpl::RemoveDescription() { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, + wxCHECK_MSG( !m_ext.empty(), false, _T("RemoveDescription() needs extension") ); wxRegKey rkey (wxRegKey::HKCR, m_strFileType ); @@ -824,4 +819,4 @@ bool wxFileTypeImpl::RemoveDescription() } #endif // wxUSE_MIMETYPE -#endif // __PALMOS__ +#endif // __WXPALMOS__ diff --git a/src/palmos/mslu.cpp b/src/palmos/mslu.cpp index 673c0d51c9..5c207b4d46 100644 --- a/src/palmos/mslu.cpp +++ b/src/palmos/mslu.cpp @@ -16,9 +16,9 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -// This may or may not apply to Palm OS in the future, but for right now Unicode +// This may or may not apply to Palm OS in the future, but for right now Unicode // is not supported. -#ifndef __PALMOS__ +#ifndef __WXPALMOS__ #ifdef __BORLANDC__ #pragma hdrstop @@ -153,59 +153,8 @@ WXDLLEXPORT int wxMSLU__tremove(const wxChar *name) return _tremove(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) -{ - if ( wxUsingUnicowsDll() ) -#ifdef __BORLANDC__ - return open(wxConvFile.cWX2MB(name), flags, mode); -#else - return _open(wxConvFile.cWX2MB(name), flags, mode); -#endif - else - return _wopen(name, flags, mode); -} - -WXDLLEXPORT int wxMSLU__waccess(const wxChar *name, int mode) -{ - if ( wxUsingUnicowsDll() ) - return _access(wxConvFile.cWX2MB(name), mode); - else - return _waccess(name, mode); -} - -WXDLLEXPORT int wxMSLU__wmkdir(const wxChar *name) -{ - if ( wxUsingUnicowsDll() ) - return _mkdir(wxConvFile.cWX2MB(name)); - else - return _wmkdir(name); -} - -WXDLLEXPORT int wxMSLU__wrmdir(const wxChar *name) -{ - if ( wxUsingUnicowsDll() ) - return _rmdir(wxConvFile.cWX2MB(name)); - else - return _wrmdir(name); -} - -WXDLLEXPORT int wxMSLU__wstat(const wxChar *name, struct _stat *buffer) -{ - if ( wxUsingUnicowsDll() ) - return _stat((const char*)wxConvFile.cWX2MB(name), buffer); - else - return _wstat(name, buffer); -} - -#endif // compilers having wopen() &c - #endif // wxUSE_BASE #endif // wxUSE_UNICODE_MSLU -#endif // __PALMOS__ +#endif // __WXPALMOS__ diff --git a/src/palmos/ownerdrw.cpp b/src/palmos/ownerdrw.cpp index 83dc9bc366..80c6704b80 100644 --- a/src/palmos/ownerdrw.cpp +++ b/src/palmos/ownerdrw.cpp @@ -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 /////////////////////////////////////////////////////////////////////////////// @@ -44,21 +44,6 @@ public: virtual bool OnInit() { ms_systemMenuFont = new wxFont; - -#if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK) - NONCLIENTMETRICS nm; - nm.cbSize = sizeof(NONCLIENTMETRICS); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS,0,&nm,0); - - ms_systemMenuButtonWidth = nm.iMenuHeight; - ms_systemMenuHeight = nm.iMenuHeight; - - // create menu font - wxNativeFontInfo info; - memcpy(&info.lf, &nm.lfMenuFont, sizeof(LOGFONT)); - ms_systemMenuFont->Create(info); -#endif - return true; } diff --git a/src/palmos/registry.cpp b/src/palmos/registry.cpp index 3ab34856a8..9beceea9e2 100644 --- a/src/palmos/registry.cpp +++ b/src/palmos/registry.cpp @@ -12,10 +12,6 @@ // - add high level functions (RegisterOleServer, ...) /////////////////////////////////////////////////////////////////////////////// -// This really doesn't apply to the Palm OS platform. It would be better to -// support the Palm OS preference database instead. -#ifndef __PALMOS__ - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "registry.h" #endif @@ -27,6 +23,10 @@ #pragma hdrstop #endif +// This really doesn't apply to the Palm OS platform. It would be better to +// support the Palm OS preference database instead. +#ifndef __WXPALMOS__ + // other wxWidgets headers #include "wx/string.h" #include "wx/intl.h" @@ -122,7 +122,7 @@ wxRegKey::StdKey wxRegKey::ExtractKeyName(wxString& strKey) } else { strKey = strKey.After(REG_SEPARATOR); - if ( !strKey.IsEmpty() && strKey.Last() == REG_SEPARATOR ) + if ( !strKey.empty() && strKey.Last() == REG_SEPARATOR ) strKey.Truncate(strKey.Len() - 1); } @@ -173,8 +173,8 @@ wxRegKey::wxRegKey(const wxRegKey& keyParent, const wxString& strKey) : m_strKey(keyParent.m_strKey) { // combine our name with parent's to get the full name - if ( !m_strKey.IsEmpty() && - (strKey.IsEmpty() || strKey[0] != REG_SEPARATOR) ) { + if ( !m_strKey.empty() && + (strKey.empty() || strKey[0] != REG_SEPARATOR) ) { m_strKey += REG_SEPARATOR; } @@ -229,7 +229,7 @@ void wxRegKey::SetName(const wxRegKey& keyParent, const wxString& strKey) // next line! m_strKey.clear(); m_strKey += keyParent.m_strKey; - if ( !strKey.IsEmpty() && strKey[0] != REG_SEPARATOR ) + if ( !strKey.empty() && strKey[0] != REG_SEPARATOR ) m_strKey += REG_SEPARATOR; m_strKey += strKey; @@ -250,11 +250,11 @@ void wxRegKey::SetHkey(WXHKEY hKey) // info about the key // ---------------------------------------------------------------------------- -// returns TRUE if the key exists +// returns true if the key exists bool wxRegKey::Exists() const { // opened key has to exist, try to open it if not done yet - return IsOpened() ? TRUE : KeyExists(m_hRootKey, m_strKey); + return IsOpened() ? true : KeyExists(m_hRootKey, m_strKey); } // returns the full name of the key (prefix is abbreviated if bShortPrefix) @@ -263,7 +263,7 @@ wxString wxRegKey::GetName(bool bShortPrefix) const StdKey key = GetStdKeyFromHkey((WXHKEY) m_hRootKey); wxString str = bShortPrefix ? aStdKeys[key].szShortName : aStdKeys[key].szName; - if ( !m_strKey.IsEmpty() ) + if ( !m_strKey.empty() ) str << _T("\\") << m_strKey; return str; @@ -309,10 +309,10 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys, if ( m_dwLastError != ERROR_SUCCESS ) { wxLogSysError(m_dwLastError, _("Can't get info about registry key '%s'"), GetName().c_str()); - return FALSE; + return false; } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -323,7 +323,7 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys, bool wxRegKey::Open(AccessMode mode) { if ( IsOpened() ) - return TRUE; + return true; HKEY tmpKey; m_dwLastError = ::RegOpenKeyEx @@ -339,74 +339,74 @@ bool wxRegKey::Open(AccessMode mode) { wxLogSysError(m_dwLastError, _("Can't open registry key '%s'"), GetName().c_str()); - return FALSE; + return false; } m_hKey = (WXHKEY) tmpKey; - return TRUE; + return true; } // creates key, failing if it exists and !bOkIfExists bool wxRegKey::Create(bool bOkIfExists) { - // check for existence only if asked (i.e. order is important!) - if ( !bOkIfExists && Exists() ) - return FALSE; + // check for existence only if asked (i.e. order is important!) + if ( !bOkIfExists && Exists() ) + return false; - if ( IsOpened() ) - return TRUE; + if ( IsOpened() ) + return true; - HKEY tmpKey; + HKEY tmpKey; #ifdef __WXWINCE__ - DWORD disposition; - m_dwLastError = RegCreateKeyEx((HKEY) m_hRootKey, m_strKey, - NULL, // reserved - NULL, // class string - 0, - 0, - NULL, - &tmpKey, - &disposition); + DWORD disposition; + m_dwLastError = RegCreateKeyEx((HKEY) m_hRootKey, m_strKey, + NULL, // reserved + NULL, // class string + 0, + 0, + NULL, + &tmpKey, + &disposition); #else - m_dwLastError = RegCreateKey((HKEY) m_hRootKey, m_strKey, &tmpKey); + m_dwLastError = RegCreateKey((HKEY) m_hRootKey, m_strKey, &tmpKey); #endif - if ( m_dwLastError != ERROR_SUCCESS ) { - wxLogSysError(m_dwLastError, _("Can't create registry key '%s'"), - GetName().c_str()); - return FALSE; - } - else - { - m_hKey = (WXHKEY) tmpKey; - return TRUE; - } + if ( m_dwLastError != ERROR_SUCCESS ) { + wxLogSysError(m_dwLastError, _("Can't create registry key '%s'"), + GetName().c_str()); + return false; + } + else + { + m_hKey = (WXHKEY) tmpKey; + return true; + } } // close the key, it's not an error to call it when not opened bool wxRegKey::Close() { - if ( IsOpened() ) { - m_dwLastError = RegCloseKey((HKEY) m_hKey); - m_hKey = 0; + if ( IsOpened() ) { + m_dwLastError = RegCloseKey((HKEY) m_hKey); + m_hKey = 0; - if ( m_dwLastError != ERROR_SUCCESS ) { - wxLogSysError(m_dwLastError, _("Can't close registry key '%s'"), - GetName().c_str()); + if ( m_dwLastError != ERROR_SUCCESS ) { + wxLogSysError(m_dwLastError, _("Can't close registry key '%s'"), + GetName().c_str()); - return FALSE; + return false; + } } - } - return TRUE; + return true; } bool wxRegKey::RenameValue(const wxChar *szValueOld, const wxChar *szValueNew) { - bool ok = TRUE; + bool ok = true; if ( HasValue(szValueNew) ) { wxLogError(_("Registry value '%s' already exists."), szValueNew); - ok = FALSE; + ok = false; } if ( !ok || @@ -415,10 +415,10 @@ bool wxRegKey::RenameValue(const wxChar *szValueOld, const wxChar *szValueNew) wxLogError(_("Failed to rename registry value '%s' to '%s'."), szValueOld, szValueNew); - return FALSE; + return false; } - return TRUE; + return true; } bool wxRegKey::CopyValue(const wxChar *szValue, @@ -450,33 +450,22 @@ bool wxRegKey::CopyValue(const wxChar *szValue, // exactly they should be copied and because they shouldn't // occur among the application keys (supposedly created with // this class) -#ifdef __WIN32__ - case Type_None: - case Type_Expand_String: - case Type_Binary: - case Type_Dword_big_endian: - case Type_Link: - case Type_Multi_String: - case Type_Resource_list: - case Type_Full_resource_descriptor: - case Type_Resource_requirements_list: -#endif // Win32 default: wxLogError(_("Can't copy values of unsupported type %d."), GetValueType(szValue)); - return FALSE; + return false; } } bool wxRegKey::Rename(const wxChar *szNewName) { - wxCHECK_MSG( !!m_strKey, FALSE, _T("registry hives can't be renamed") ); + wxCHECK_MSG( !!m_strKey, false, _T("registry hives can't be renamed") ); if ( !Exists() ) { wxLogError(_("Registry key '%s' does not exist, cannot rename it."), GetFullName(this)); - return FALSE; + return false; } // do we stay in the same hive? @@ -502,7 +491,7 @@ bool wxRegKey::Rename(const wxChar *szNewName) keyDst.SetName(szNewName); } - bool ok = keyDst.Create(FALSE /* fail if alredy exists */); + bool ok = keyDst.Create(false /* fail if alredy exists */); if ( !ok ) { wxLogError(_("Registry key '%s' already exists."), GetFullName(&keyDst)); @@ -527,7 +516,7 @@ bool wxRegKey::Copy(const wxChar *szNewName) { // create the new key first wxRegKey keyDst(szNewName); - bool ok = keyDst.Create(FALSE /* fail if alredy exists */); + bool ok = keyDst.Create(false /* fail if alredy exists */); if ( ok ) { ok = Copy(keyDst); @@ -542,7 +531,7 @@ bool wxRegKey::Copy(const wxChar *szNewName) bool wxRegKey::Copy(wxRegKey& keyDst) { - bool ok = TRUE; + bool ok = true; // copy all sub keys to the new location wxString strKey; @@ -590,19 +579,19 @@ bool wxRegKey::DeleteSelf() wxLogNull nolog; if ( !Open() ) { // it already doesn't exist - ok! - return TRUE; + return true; } } // prevent a buggy program from erasing one of the root registry keys or an // immediate subkey (i.e. one which doesn't have '\\' inside) of any other // key except HKCR (HKCR has some "deleteable" subkeys) - if ( m_strKey.IsEmpty() || + if ( m_strKey.empty() || ((m_hRootKey != (WXHKEY) aStdKeys[HKCR].hkey) && (m_strKey.Find(REG_SEPARATOR) == wxNOT_FOUND)) ) { wxLogError(_("Registry key '%s' is needed for normal system operation,\ndeleting it will leave your system in unusable state:\noperation aborted."), GetFullName(this)); - return FALSE; + return false; } // we can't delete keys while enumerating because it confuses GetNextKey, so @@ -622,7 +611,7 @@ bool wxRegKey::DeleteSelf() for ( size_t nKey = 0; nKey < nKeyCount; nKey++ ) { wxRegKey key(*this, astrSubkeys[nKey]); if ( !key.DeleteSelf() ) - return FALSE; + return false; } // now delete this key itself @@ -634,16 +623,16 @@ bool wxRegKey::DeleteSelf() m_dwLastError != ERROR_FILE_NOT_FOUND ) { wxLogSysError(m_dwLastError, _("Can't delete key '%s'"), GetName().c_str()); - return FALSE; + return false; } - return TRUE; + return true; } bool wxRegKey::DeleteKey(const wxChar *szKey) { if ( !Open() ) - return FALSE; + return false; wxRegKey key(*this, szKey); return key.DeleteSelf(); @@ -652,7 +641,7 @@ bool wxRegKey::DeleteKey(const wxChar *szKey) bool wxRegKey::DeleteValue(const wxChar *szValue) { if ( !Open() ) - return FALSE; + return false; m_dwLastError = RegDeleteValue((HKEY) m_hKey, WXSTRINGCAST szValue); @@ -661,24 +650,24 @@ bool wxRegKey::DeleteValue(const wxChar *szValue) (m_dwLastError != ERROR_FILE_NOT_FOUND) ) { wxLogSysError(m_dwLastError, _("Can't delete value '%s' from key '%s'"), szValue, GetName().c_str()); - return FALSE; + return false; } - return TRUE; + return true; } // ---------------------------------------------------------------------------- // access to values and subkeys // ---------------------------------------------------------------------------- -// return TRUE if value exists +// return true if value exists bool wxRegKey::HasValue(const wxChar *szValue) const { // this function should be silent, so suppress possible messages from Open() wxLogNull nolog; if ( !CONST_CAST Open() ) - return FALSE; + return false; LONG dwRet = ::RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, @@ -687,7 +676,7 @@ bool wxRegKey::HasValue(const wxChar *szValue) const return dwRet == ERROR_SUCCESS; } -// returns TRUE if this key has any values +// returns true if this key has any values bool wxRegKey::HasValues() const { // suppress possible messages from GetFirstValue() @@ -699,7 +688,7 @@ bool wxRegKey::HasValues() const return CONST_CAST GetFirstValue(str, l); } -// returns TRUE if this key has any subkeys +// returns true if this key has any subkeys bool wxRegKey::HasSubkeys() const { // suppress possible messages from GetFirstKey() @@ -711,14 +700,14 @@ bool wxRegKey::HasSubkeys() const return CONST_CAST GetFirstKey(str, l); } -// returns TRUE if given subkey exists +// returns true if given subkey exists bool wxRegKey::HasSubKey(const wxChar *szKey) const { // this function should be silent, so suppress possible messages from Open() wxLogNull nolog; if ( !CONST_CAST Open() ) - return FALSE; + return false; return KeyExists(m_hKey, szKey); } @@ -740,47 +729,6 @@ wxRegKey::ValueType wxRegKey::GetValueType(const wxChar *szValue) const return (ValueType)dwType; } -#ifdef __WIN32__ -bool wxRegKey::SetValue(const wxChar *szValue, long lValue) -{ - if ( CONST_CAST Open() ) { - m_dwLastError = RegSetValueEx((HKEY) m_hKey, szValue, (DWORD) RESERVED, REG_DWORD, - (RegString)&lValue, sizeof(lValue)); - if ( m_dwLastError == ERROR_SUCCESS ) - return TRUE; - } - - wxLogSysError(m_dwLastError, _("Can't set value of '%s'"), - GetFullName(this, szValue)); - return FALSE; -} - -bool wxRegKey::QueryValue(const wxChar *szValue, long *plValue) const -{ - if ( CONST_CAST Open() ) { - DWORD dwType, dwSize = sizeof(DWORD); - RegString pBuf = (RegString)plValue; - m_dwLastError = RegQueryValueEx((HKEY) m_hKey, WXSTRINGCAST szValue, RESERVED, - &dwType, pBuf, &dwSize); - if ( m_dwLastError != ERROR_SUCCESS ) { - wxLogSysError(m_dwLastError, _("Can't read value of key '%s'"), - GetName().c_str()); - return FALSE; - } - else { - // check that we read the value of right type - wxASSERT_MSG( IsNumericValue(szValue), - wxT("Type mismatch in wxRegKey::QueryValue().") ); - - return TRUE; - } - } - else - return FALSE; -} - -#endif //Win32 - bool wxRegKey::QueryValue(const wxChar *szValue, wxString& strValue, bool raw) const @@ -837,14 +785,14 @@ bool wxRegKey::QueryValue(const wxChar *szValue, wxASSERT_MSG( !IsNumericValue(szValue), wxT("Type mismatch in wxRegKey::QueryValue().") ); - return TRUE; + return true; } } } wxLogSysError(m_dwLastError, _("Can't read value of '%s'"), GetFullName(this, szValue)); - return FALSE; + return false; } bool wxRegKey::SetValue(const wxChar *szValue, const wxString& strValue) @@ -854,12 +802,12 @@ bool wxRegKey::SetValue(const wxChar *szValue, const wxString& strValue) (RegString)strValue.c_str(), (strValue.Len() + 1)*sizeof(wxChar)); if ( m_dwLastError == ERROR_SUCCESS ) - return TRUE; + return true; } wxLogSysError(m_dwLastError, _("Can't set value of '%s'"), GetFullName(this, szValue)); - return FALSE; + return false; } wxString wxRegKey::QueryDefaultValue() const @@ -878,7 +826,7 @@ wxString wxRegKey::QueryDefaultValue() const bool wxRegKey::GetFirstValue(wxString& strValueName, long& lIndex) { if ( !Open() ) - return FALSE; + return false; lIndex = 0; return GetNextValue(strValueName, lIndex); @@ -890,7 +838,7 @@ bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const // are we already at the end of enumeration? if ( lIndex == -1 ) - return FALSE; + return false; wxChar szValueName[1024]; // @@ use RegQueryInfoKey... DWORD dwValueLen = WXSIZEOF(szValueName); @@ -912,18 +860,18 @@ bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const GetName().c_str()); } - return FALSE; + return false; } strValueName = szValueName; - return TRUE; + return true; } bool wxRegKey::GetFirstKey(wxString& strKeyName, long& lIndex) { if ( !Open() ) - return FALSE; + return false; lIndex = 0; return GetNextKey(strKeyName, lIndex); @@ -935,7 +883,7 @@ bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const // are we already at the end of enumeration? if ( lIndex == -1 ) - return FALSE; + return false; wxChar szKeyName[_MAX_PATH + 1]; @@ -957,27 +905,27 @@ bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const GetName().c_str()); } - return FALSE; + return false; } strKeyName = szKeyName; - return TRUE; + return true; } -// 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 wxRegKey::IsNumericValue(const wxChar *szValue) const - { - ValueType type = GetValueType(szValue); - switch ( type ) { +{ + ValueType type = GetValueType(szValue); + switch ( type ) { case Type_Dword: /* case Type_Dword_little_endian: == Type_Dword */ case Type_Dword_big_endian: - return TRUE; + return true; default: - return FALSE; - } - } + return false; + } +} // ============================================================================ // implementation of global private functions @@ -987,7 +935,7 @@ bool KeyExists(WXHKEY hRootKey, const wxChar *szKey) { // don't close this key itself for the case of empty szKey! if ( wxIsEmpty(szKey) ) - return TRUE; + return true; HKEY hkeyDummy; if ( ::RegOpenKeyEx @@ -1001,10 +949,10 @@ bool KeyExists(WXHKEY hRootKey, const wxChar *szKey) { ::RegCloseKey(hkeyDummy); - return TRUE; + return true; } - return FALSE; + return false; } const wxChar *GetFullName(const wxRegKey *pKey, const wxChar *szValue) @@ -1019,7 +967,7 @@ const wxChar *GetFullName(const wxRegKey *pKey, const wxChar *szValue) void RemoveTrailingSeparator(wxString& str) { - if ( !str.IsEmpty() && str.Last() == REG_SEPARATOR ) + if ( !str.empty() && str.Last() == REG_SEPARATOR ) str.Truncate(str.Len() - 1); } diff --git a/src/palmos/renderer.cpp b/src/palmos/renderer.cpp index c73da5c1bd..bc590a79c1 100644 --- a/src/palmos/renderer.cpp +++ b/src/palmos/renderer.cpp @@ -17,9 +17,6 @@ // headers // ---------------------------------------------------------------------------- -// Palm OS doesn't really have a theme engine, so this is not needed. -#ifndef __PALMOS__ - // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -27,6 +24,9 @@ #pragma hdrstop #endif +// Palm OS doesn't really have a theme engine, so this is not needed. +#ifndef __WXPALMOS__ + #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/window.h" @@ -154,7 +154,7 @@ wxRendererXP::DrawSplitterSash(wxWindow *win, win, dc, size, position, orient, flags); return; } - + // I don't know if it is correct to use the rebar background for the // splitter but it least this works ok in the default theme wxUxThemeHandle hTheme(win, L"REBAR"); @@ -164,7 +164,7 @@ wxRendererXP::DrawSplitterSash(wxWindow *win, if ( orient == wxVERTICAL ) { rect.left = position; - rect.right = position + SASH_WIDTH; + rect.right = position + SASH_WIDTH; rect.top = 0; rect.bottom = size.y; } @@ -184,7 +184,7 @@ wxRendererXP::DrawSplitterSash(wxWindow *win, 0 /* no state */ , &rect, NULL - ); + ); } } diff --git a/src/palmos/textctrl.cpp b/src/palmos/textctrl.cpp index e0bdf7e6f5..147c1fd8a4 100644 --- a/src/palmos/textctrl.cpp +++ b/src/palmos/textctrl.cpp @@ -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 ///////////////////////////////////////////////////////////////////////////// @@ -105,7 +105,7 @@ wxBEGIN_FLAGS( wxTextCtrlStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -146,7 +146,7 @@ wxEND_FLAGS( wxTextCtrlStyle ) IMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl,"wx/textctrl.h") wxBEGIN_PROPERTIES_TABLE(wxTextCtrl) - wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent ) + wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent ) wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent ) wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) @@ -321,15 +321,6 @@ void wxTextCtrl::Clear() { } -#ifdef __WIN32__ - -bool wxTextCtrl::EmulateKeyPress(const wxKeyEvent& event) -{ - return false; -} - -#endif // __WIN32__ - // ---------------------------------------------------------------------------- // Clipboard operations // ---------------------------------------------------------------------------- @@ -475,7 +466,7 @@ wxTextCtrl::HitTest(const wxPoint& pt, wxTextCoord *col, wxTextCoord *row) const } // ---------------------------------------------------------------------------- -// +// // ---------------------------------------------------------------------------- void wxTextCtrl::ShowPosition(long pos) diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp index 7be136109f..95afadc87e 100644 --- a/src/palmos/window.cpp +++ b/src/palmos/window.cpp @@ -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 ///////////////////////////////////////////////////////////////////////////// @@ -153,7 +153,7 @@ wxBEGIN_FLAGS( wxWindowStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -1042,11 +1042,6 @@ bool wxWindowPalm::HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam) return false; } -int wxWindowPalm::HandleMenuChar(int chAccel, WXLPARAM lParam) -{ - return 0; -} - // --------------------------------------------------------------------------- // joystick // --------------------------------------------------------------------------- @@ -1062,7 +1057,7 @@ bool wxWindowPalm::HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags) bool wxWindowPalm::PalmOnScroll(int orientation, WXWORD wParam, WXWORD pos, WXHWND control) -{ +{ return false; } -- 2.45.2