From: Julian Smart Date: Mon, 16 Jun 2003 12:31:45 +0000 (+0000) Subject: Platform and compiler-specific checking for MSW and Mac now done X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/01ebf7520366a4cf80975d820794fea394c96d7b?ds=sidebyside Platform and compiler-specific checking for MSW and Mac now done in wx/xxx/chkconf.h. Removed some very obsolete settings, and MSW-specific settings from Mac's setup0.h. wxTimer now derives from wxEvtHandler. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/docs/changes.txt b/docs/changes.txt index 2b9c0c27ac..af4b680d89 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -42,6 +42,8 @@ All: - added Catalan translations (Pau Bosch i Crespo) - added Ukrainian translations (Eugene Manko) - fixed bug with deleting entries at root level in wxFileConfig +- chkconf.h now includes platform-specific versions (for MSW + and Mac) which contain some tests that were in setup.h wxBase: @@ -82,6 +84,8 @@ All GUI ports: - Wizard now validates when pressing Back or Next - Implemented wxNotebook::DoGetBestSize so Fit now works - Added FindItemByPosition to wxMenu +- wxTimer now derives from wxEvtHandler and is its own owner + object by default Unix: diff --git a/docs/latex/wx/timer.tex b/docs/latex/wx/timer.tex index 1648196884..88ecf4940b 100644 --- a/docs/latex/wx/timer.tex +++ b/docs/latex/wx/timer.tex @@ -11,9 +11,13 @@ There are two different ways to use this class: \helpref{Notify}{wxtimernotify} member to perform the required action. \item Or you may redirect the notifications to any \helpref{wxEvtHandler}{wxevthandler} derived object by using the non default -constructor or \helpref{SetOwner}{wxtimersetowner}. Then use {\tt EVT\_TIMER} +constructor or \helpref{SetOwner}{wxtimersetowner}. Then use the {\tt EVT\_TIMER} macro to connect it to the event handler which will receive \helpref{wxTimerEvent}{wxtimerevent} notifications. +\item Or you may use a derived class and the {\tt EVT\_TIMER} +macro to connect it to an event handler defined in the derived class. +If the default constructor is used, the timer object will be its +own owner object, since it is derived from wxEvtHandler. \end{enumerate} In any case, you must start the timer with \helpref{Start}{wxtimerstart} @@ -24,7 +28,7 @@ be stopped later with \helpref{Stop}{wxtimerstop}. \wxheading{Derived from} -\helpref{wxObject}{wxobject} +\helpref{wxEvtHandler}{wxevthandler} \wxheading{Include files} diff --git a/docs/publicity/publicity.txt b/docs/publicity/publicity.txt index 59322f3afb..15d59c45a1 100644 --- a/docs/publicity/publicity.txt +++ b/docs/publicity/publicity.txt @@ -14,6 +14,7 @@ comp.os.ms-windows.programmer.win32 comp.windows.ms.programmer microsoft.public.win32.programmer.tools microsoft.public.win32.programmer.ui +microsoft.public.win32.programmer.3rdparty Non-Microsoft: diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 45f5b187a2..c8b3080280 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -11,6 +11,16 @@ /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ +/* + Compiler-specific checking. + */ + +#if defined(__WXMSW__) +# include "wx/msw/chkconf.h" +#elif defined(__WXMAC__) +# include "wx/mac/chkconf.h" +#endif + /* this global setting determines what should we do if the setting FOO requires BAR and BAR is not set: we can either silently define BAR diff --git a/include/wx/mac/chkconf.h b/include/wx/mac/chkconf.h new file mode 100644 index 0000000000..e7c5d596c5 --- /dev/null +++ b/include/wx/mac/chkconf.h @@ -0,0 +1,30 @@ +/* + * Name: wx/mac/chkconf.h + * Purpose: Compiler-specific configuration checking + * Author: Julian Smart + * Modified by: + * Created: 01/02/97 + * RCS-ID: $Id$ + * Copyright: (c) Julian Smart + * Licence: wxWindows licence + */ + +#ifndef _WX_MAC_CHKCONF_H_ +#define _WX_MAC_CHKCONF_H_ + +/* + * disable the settings which don't work for some compilers + */ + +/* + * wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior + */ + +#if defined(__MWERKS__) + #undef wxUSE_DEBUG_NEW_ALWAYS + #define wxUSE_DEBUG_NEW_ALWAYS 0 +#endif + +#endif + /* _WX_MAC_CHKCONF_H_ */ + diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index fc96743177..d656ec1cea 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -915,287 +915,9 @@ // Set to 1 to compile in wxPalette class #define wxUSE_PALETTE 1 -// ---------------------------------------------------------------------------- -// Mac-only settings -// ---------------------------------------------------------------------------- - -#define WORDS_BIGENDIAN 1 - -// ---------------------------------------------------------------------------- -// Windows-only settings -// ---------------------------------------------------------------------------- - -// Set this to 1 if you want to use wxWindows and MFC in the same program. This -// will override some other settings (see below) -// -// Default is 0. -// -// Recommended setting: 0 unless you really have to use MFC -#define wxUSE_MFC 0 - -// Set this to 1 for generic OLE support: this is required for drag-and-drop, -// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and -// can't compile/doesn't have the OLE headers. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_OLE 1 - -// Set this to 1 to use Microsoft CTL3D library for "3D-look" under Win16 or NT -// 3.x. This setting is ignored under Win9x and NT 4.0+. -// -// Default is 0 for (most) Win32 (systems), 1 for Win16 -// -// Recommended setting: same as default -#if defined(__WIN95__) -#define wxUSE_CTL3D 0 -#else -#define wxUSE_CTL3D 1 -#endif - -// Define as 1 to use Microsoft's ItsyBitsy small title bar library, for -// wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native -// miniframes support instead. -// -// Default is 0 for (most) Win32 (systems), 1 for Win16 -// -// Recommended setting: same as default -#if defined(__WIN95__) -#define wxUSE_ITSY_BITSY 0 -#else -#define wxUSE_ITSY_BITSY 1 -#endif - -// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH -// which allows to put more than ~32Kb of text in it even under Win9x (NT -// doesn't have such limitation). -// -// Default is 1 for compilers which support it -// -// Recommended setting: 1, only set it to 0 if your compiler doesn't have -// or can't compile -#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__) -#define wxUSE_RICHEDIT 1 - -// TODO: This should be ifdef'ed for any compilers that don't support -// RichEdit 2.0 but do have RichEdit 1.0... -#define wxUSE_RICHEDIT2 1 - -#else -#define wxUSE_RICHEDIT 0 -#define wxUSE_RICHEDIT2 0 -#endif - -// Set this to 1 to enable support for the owner-drawn menu and listboxes. This -// is not required on mac by wxUSE_CHECKLISTBOX. -// -// Default is 1. -// -// Recommended setting: O as not implemented on mac -#define wxUSE_OWNER_DRAWN 0 - -// ---------------------------------------------------------------------------- -// obsolete settings -// ---------------------------------------------------------------------------- - -// NB: all settings in this section are obsolete and should not be used/changed -// at all, they will disappear - -// Set to 1 to use PenWindows -#define wxUSE_PENWINDOWS 0 - -// Define 1 to use bitmap messages. -#define wxUSE_BITMAP_MESSAGE 1 - // If 1, enables provision of run-time type information. // NOW MANDATORY: don't change. #define wxUSE_DYNAMIC_CLASSES 1 -// ---------------------------------------------------------------------------- -// disable the settings which don't work for some compilers -// ---------------------------------------------------------------------------- - -#ifndef wxUSE_NORLANDER_HEADERS -#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) -# define wxUSE_NORLANDER_HEADERS 1 -#else -# define wxUSE_NORLANDER_HEADERS 0 -#endif -#endif - -#if defined(__GNUWIN32__) -// These don't work as expected for mingw32 and cygwin32 -#undef wxUSE_MEMORY_TRACING -#define wxUSE_MEMORY_TRACING 0 - -#undef wxUSE_GLOBAL_MEMORY_OPERATORS -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -#undef wxUSE_DEBUG_NEW_ALWAYS -#define wxUSE_DEBUG_NEW_ALWAYS 0 - -// Cygwin betas don't have wcslen -#if defined(__CYGWIN__) || defined(__CYGWIN32__) -# if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) -# undef wxUSE_WCHAR_T -# define wxUSE_WCHAR_T 0 -# endif -#endif - -#endif // __GNUWIN32__ - -// MFC duplicates these operators -#if wxUSE_MFC -#undef wxUSE_GLOBAL_MEMORY_OPERATORS -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -#undef wxUSE_DEBUG_NEW_ALWAYS -#define wxUSE_DEBUG_NEW_ALWAYS 0 -#endif // wxUSE_MFC - - -// Only WIN32 supports wxStatusBar95 -#if !defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR -#undef wxUSE_NATIVE_STATUSBAR -#define wxUSE_NATIVE_STATUSBAR 0 -#endif - -/* NOT TRUE ON MAC -#if !wxUSE_OWNER_DRAWN -#undef wxUSE_CHECKLISTBOX -#define wxUSE_CHECKLISTBOX 0 -#endif -*/ - -// Salford C++ doesn't like some of the memory operator definitions -#ifdef __SALFORDC__ -#undef wxUSE_MEMORY_TRACING -#define wxUSE_MEMORY_TRACING 0 - -#undef wxUSE_GLOBAL_MEMORY_OPERATORS -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -#undef wxUSE_DEBUG_NEW_ALWAYS -#define wxUSE_DEBUG_NEW_ALWAYS 0 - -#undef wxUSE_THREADS -#define wxUSE_THREADS 0 - -#undef wxUSE_OWNER_DRAWN -#define wxUSE_OWNER_DRAWN 0 -#endif // __SALFORDC__ - -// BC++/Win16 can't cope with the amount of data in resource.cpp -#if defined(__WIN16__) && defined(__BORLANDC__) -#undef wxUSE_WX_RESOURCES -#define wxUSE_WX_RESOURCES 0 - -#undef wxUSE_ODBC -#define wxUSE_ODBC 0 - -#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__) -/* -#undef wxUSE_GLCANVAS -#define wxUSE_GLCANVAS 0 -*/ - -#undef wxUSE_WCHAR_T -#define wxUSE_WCHAR_T 0 -#endif - -#if defined(__WXMSW__) && !defined(__WIN32__) - -#undef wxUSE_SOCKETS -#define wxUSE_SOCKETS 0 - -#undef wxUSE_THREADS -#define wxUSE_THREADS 0 - -#undef wxUSE_TOOLTIPS -#define wxUSE_TOOLTIPS 0 - -#undef wxUSE_SPINCTRL -#define wxUSE_SPINCTRL 0 - -#undef wxUSE_SPINBTN -#define wxUSE_SPINBTN 0 - -#undef wxUSE_LIBPNG -#define wxUSE_LIBPNG 0 - -#undef wxUSE_LIBJPEG -#define wxUSE_LIBJPEG 0 - -#undef wxUSE_LIBTIFF -#define wxUSE_LIBTIFF 0 - -#undef wxUSE_GIF -#define wxUSE_GIF 0 - -#undef wxUSE_PNM -#define wxUSE_PNM 0 - -#undef wxUSE_PCX -#define wxUSE_PCX 0 - -#undef wxUSE_GLCANVAS -#define wxUSE_GLCANVAS 0 - -#undef wxUSE_MS_HTML_HELP -#define wxUSE_MS_HTML_HELP 0 - -#undef wxUSE_WCHAR_T -#define wxUSE_WCHAR_T 0 - -#endif // Win16 - -// ---------------------------------------------------------------------------- -// undef the things which don't make sense for wxBase build -// ---------------------------------------------------------------------------- - -#if !wxUSE_GUI - -#undef wxUSE_HTML -#define wxUSE_HTML 0 - -#endif // !wxUSE_GUI - -// ---------------------------------------------------------------------------- -// check the settings consistency: do it here to abort compilation immediately -// and not almost in the very end when the relevant file fails to compile and -// you need to modify setup.h and rebuild everything -// ---------------------------------------------------------------------------- - -#if wxUSE_DATETIME && !wxUSE_LONGLONG - #error wxDateTime requires wxLongLong -#endif - -#if wxUSE_TEXTFILE && !wxUSE_FILE - #error You cannot compile wxTextFile without wxFile -#endif - -#if wxUSE_FILESYSTEM && !wxUSE_STREAMS - #error You cannot compile virtual file systems without wxUSE_STREAMS -#endif - -#if wxUSE_HTML && !wxUSE_FILESYSTEM - #error You cannot compile wxHTML without virtual file systems -#endif - -// add more tests here... - #endif // _WX_SETUP_H_ diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h new file mode 100644 index 0000000000..5f31c7f6f4 --- /dev/null +++ b/include/wx/msw/chkconf.h @@ -0,0 +1,98 @@ +/* + * Name: wx/msw/chkconf.h + * Purpose: Compiler-specific configuration checking + * Author: Julian Smart + * Modified by: + * Created: 01/02/97 + * RCS-ID: $Id$ + * Copyright: (c) Julian Smart + * Licence: wxWindows licence + */ + +#ifndef _WX_MSW_CHKCONF_H_ +#define _WX_MSW_CHKCONF_H_ + +/* + * disable the settings which don't work for some compilers + */ + +#ifndef wxUSE_NORLANDER_HEADERS +#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))) +# define wxUSE_NORLANDER_HEADERS 1 +#else +# define wxUSE_NORLANDER_HEADERS 0 +#endif +#endif + +/* + * wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior + */ + +#if defined(__MWERKS__) + #undef wxUSE_DEBUG_NEW_ALWAYS + #define wxUSE_DEBUG_NEW_ALWAYS 0 +#endif + +#if defined(__GNUWIN32__) +/* These don't work as expected for mingw32 and cygwin32 */ +#undef wxUSE_MEMORY_TRACING +#define wxUSE_MEMORY_TRACING 0 + +#undef wxUSE_GLOBAL_MEMORY_OPERATORS +#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 + +#undef wxUSE_DEBUG_NEW_ALWAYS +#define wxUSE_DEBUG_NEW_ALWAYS 0 + +/* Cygwin betas don't have wcslen */ +#if defined(__CYGWIN__) || defined(__CYGWIN32__) +# if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) +# undef wxUSE_WCHAR_T +# define wxUSE_WCHAR_T 0 +# endif +#endif + +#endif + /* __GNUWIN32__ */ + +/* MFC duplicates these operators */ +#if wxUSE_MFC +#undef wxUSE_GLOBAL_MEMORY_OPERATORS +#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 + +#undef wxUSE_DEBUG_NEW_ALWAYS +#define wxUSE_DEBUG_NEW_ALWAYS 0 +#endif + /* wxUSE_MFC */ + +#if (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) +/* GnuWin32 doesn't have appropriate headers for e.g. IUnknown. */ +#undef wxUSE_DRAG_AND_DROP +#define wxUSE_DRAG_AND_DROP 0 +#endif + +#if !wxUSE_OWNER_DRAWN +#undef wxUSE_CHECKLISTBOX +#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_MSW_CHKCONF_H_ */ + diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index c1c305a597..75ab56ebe2 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -1045,167 +1045,5 @@ // NOW MANDATORY: don't change. #define wxUSE_DYNAMIC_CLASSES 1 -// ---------------------------------------------------------------------------- -// disable the settings which don't work for some compilers -// ---------------------------------------------------------------------------- - -#ifndef wxUSE_NORLANDER_HEADERS -#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))) -# define wxUSE_NORLANDER_HEADERS 1 -#else -# define wxUSE_NORLANDER_HEADERS 0 -#endif -#endif - -// wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior -#if defined(__MWERKS__) - #undef wxUSE_DEBUG_NEW_ALWAYS - #define wxUSE_DEBUG_NEW_ALWAYS 0 -#endif - -#if defined(__GNUWIN32__) -// These don't work as expected for mingw32 and cygwin32 -#undef wxUSE_MEMORY_TRACING -#define wxUSE_MEMORY_TRACING 0 - -#undef wxUSE_GLOBAL_MEMORY_OPERATORS -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -#undef wxUSE_DEBUG_NEW_ALWAYS -#define wxUSE_DEBUG_NEW_ALWAYS 0 - -// Cygwin betas don't have wcslen -#if defined(__CYGWIN__) || defined(__CYGWIN32__) -# if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) -# undef wxUSE_WCHAR_T -# define wxUSE_WCHAR_T 0 -# endif -#endif - -#endif // __GNUWIN32__ - -// MFC duplicates these operators -#if wxUSE_MFC -#undef wxUSE_GLOBAL_MEMORY_OPERATORS -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -#undef wxUSE_DEBUG_NEW_ALWAYS -#define wxUSE_DEBUG_NEW_ALWAYS 0 -#endif // wxUSE_MFC - -#if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) -// Can't use OLE drag and drop in Windows 3.1 because we don't know how -// to implement UUIDs -// GnuWin32 doesn't have appropriate headers for e.g. IUnknown. -#undef wxUSE_DRAG_AND_DROP -#define wxUSE_DRAG_AND_DROP 0 -#endif - -// Only WIN32 supports wxStatusBar95 -#if !defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR -#undef wxUSE_NATIVE_STATUSBAR -#define wxUSE_NATIVE_STATUSBAR 0 -#endif - -#if !wxUSE_OWNER_DRAWN -#undef wxUSE_CHECKLISTBOX -#define wxUSE_CHECKLISTBOX 0 -#endif - -// Salford C++ doesn't like some of the memory operator definitions -#ifdef __SALFORDC__ -#undef wxUSE_MEMORY_TRACING -#define wxUSE_MEMORY_TRACING 0 - -#undef wxUSE_GLOBAL_MEMORY_OPERATORS -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -#undef wxUSE_DEBUG_NEW_ALWAYS -#define wxUSE_DEBUG_NEW_ALWAYS 0 - -#undef wxUSE_THREADS -#define wxUSE_THREADS 0 - -#undef wxUSE_OWNER_DRAWN -#define wxUSE_OWNER_DRAWN 0 -#endif // __SALFORDC__ - -// BC++/Win16 can't cope with the amount of data in resource.cpp -#if defined(__WIN16__) && defined(__BORLANDC__) -#undef wxUSE_WX_RESOURCES -#define wxUSE_WX_RESOURCES 0 - -#undef wxUSE_ODBC -#define wxUSE_ODBC 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_GLCANVAS -#define wxUSE_GLCANVAS 0 -*/ - -#undef wxUSE_WCHAR_T -#define wxUSE_WCHAR_T 0 -#endif - -#if defined(__WXMSW__) && !defined(__WIN32__) - -#undef wxUSE_SOCKETS -#define wxUSE_SOCKETS 0 - -#undef wxUSE_THREADS -#define wxUSE_THREADS 0 - -#undef wxUSE_TOOLTIPS -#define wxUSE_TOOLTIPS 0 - -#undef wxUSE_SPINCTRL -#define wxUSE_SPINCTRL 0 - -#undef wxUSE_SPINBTN -#define wxUSE_SPINBTN 0 - -#undef wxUSE_LIBPNG -#define wxUSE_LIBPNG 0 - -#undef wxUSE_LIBJPEG -#define wxUSE_LIBJPEG 0 - -#undef wxUSE_LIBTIFF -#define wxUSE_LIBTIFF 0 - -#undef wxUSE_GIF -#define wxUSE_GIF 0 - -#undef wxUSE_PNM -#define wxUSE_PNM 0 - -#undef wxUSE_PCX -#define wxUSE_PCX 0 - -#undef wxUSE_GLCANVAS -#define wxUSE_GLCANVAS 0 - -#undef wxUSE_MS_HTML_HELP -#define wxUSE_MS_HTML_HELP 0 - -#undef wxUSE_WCHAR_T -#define wxUSE_WCHAR_T 0 - -#endif // Win16 - #endif // _WX_SETUP_H_ diff --git a/include/wx/platform.h b/include/wx/platform.h index 0f9f485fae..a6f6f0ba66 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -319,5 +319,11 @@ #endif #endif +#if defined (__WXMAC__) + #ifndef WORDS_BIGENDIAN + #define WORDS_BIGENDIAN 1 + #endif +#endif + #endif /* _WX_PLATFORM_H_ */ diff --git a/include/wx/timer.h b/include/wx/timer.h index 33042164ed..77d2710666 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -37,7 +37,7 @@ #define wxTIMER_ONE_SHOT TRUE // the interface of wxTimer class -class WXDLLEXPORT wxTimerBase : public wxObject +class WXDLLEXPORT wxTimerBase : public wxEvtHandler { public: // ctors and initializers @@ -45,7 +45,7 @@ public: // default: if you don't call SetOwner(), your only chance to get timer // notifications is to override Notify() in the derived class - wxTimerBase() { Init(); SetOwner(NULL); } + wxTimerBase() { Init(); SetOwner(this); } // ctor which allows to avoid having to override Notify() in the derived // class: the owner will get timer notifications which can be handled with diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp index 7ce3d36fde..69d5bf1ee9 100644 --- a/src/common/menucmn.cpp +++ b/src/common/menucmn.cpp @@ -520,6 +520,16 @@ wxMenuItem *wxMenuBase::FindChildItem(int id, size_t *ppos) const return item; } +// find by position +wxMenuItem* wxMenuBase::FindItemByPosition(size_t position) const +{ + wxASSERT ( position > -1 && position < m_items.GetCount() ); + if ( position > -1 && position < m_items.GetCount() ) + return m_items.Item( position )->GetData(); + else + return NULL; +} + // ---------------------------------------------------------------------------- // wxMenu helpers used by derived classes // ---------------------------------------------------------------------------- diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 5d1b5fd01d..d87cf8ab65 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -412,13 +412,13 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message, (void)HandleCommand(id, cmd, hwnd); // even if the frame didn't process it, there is no need to try it - // once again (i.e. call wxFrame::HandleCommand()) - we just dud it, + // once again (i.e. call wxFrame::HandleCommand()) - we just did it, // so pretend we processed the message anyhow processed = true; } // always pass this message DefFrameProc(), otherwise MDI menu - // commands (and sys commands - more surprizingly!) won't work + // commands (and sys commands - more surprisingly!) won't work MSWDefWindowProc(message, wParam, lParam); break; diff --git a/utils/configtool/src/wxconfigtool.dsp b/utils/configtool/src/wxconfigtool.dsp index cde1d34ddc..e86c8efb0d 100644 --- a/utils/configtool/src/wxconfigtool.dsp +++ b/utils/configtool/src/wxconfigtool.dsp @@ -356,12 +356,12 @@ SOURCE=.\wxconfigtool.rc !ELSEIF "$(CFG)" == "wxconfigtool - Win32 DebugStable" # ADD BASE RSC /l 0x809 -# ADD RSC /l 0x809 /i "$(WXWINSTABLE)\include" +# ADD RSC /l 0x809 /i "$(WXWINSTABLE)\include" /d "wxUSE_NO_MANIFEST" !ELSEIF "$(CFG)" == "wxconfigtool - Win32 ReleaseStable" # ADD BASE RSC /l 0x809 -# ADD RSC /l 0x809 /i "$(WXWINSTABLE)\include" +# ADD RSC /l 0x809 /i "$(WXWINSTABLE)\include" /d "wxUSE_NO_MANIFEST" !ELSEIF "$(CFG)" == "wxconfigtool - Win32 DebugDev" @@ -469,5 +469,97 @@ SOURCE=..\docs\manual\makefile.vc SOURCE=..\docs\manual\tex2rtf.ini # End Source File # End Group +# Begin Source File + +SOURCE=.\wx\msw\blank.cur +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\bullseye.cur +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\cdrom.ico +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\computer.ico +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\drive.ico +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\file1.ico +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\floppy.ico +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\folder1.ico +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\folder2.ico +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\hand.cur +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\magnif1.cur +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\noentry.cur +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\pbrush.cur +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\pencil.cur +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\pntleft.cur +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\pntright.cur +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\query.cur +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\removble.ico +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\rightarr.cur +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\roller.cur +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\size.cur +# End Source File +# Begin Source File + +SOURCE=.\wx\msw\watch1.cur +# End Source File +# Begin Source File + +SOURCE=.\bitmaps\wxconfigtool.ico +# End Source File # End Target # End Project diff --git a/utils/configtool/src/wxconfigtool.rc b/utils/configtool/src/wxconfigtool.rc index 27e1424eb5..a3547d47ef 100644 --- a/utils/configtool/src/wxconfigtool.rc +++ b/utils/configtool/src/wxconfigtool.rc @@ -5,7 +5,5 @@ wxconfigtool ICON "bitmaps/wxconfigtool.ico" #include "wx/msw/wx.rc" /* Use if compiling with earlier versions of wxWindows */ -#if 0 1 24 "wxconfigtool.exe.manifest" -#endif