#ifndef _WX_DEFS_H_
#define _WX_DEFS_H_
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "defs.h"
#endif
// Make sure the environment is set correctly
#if defined(__WXMSW__) && defined(__X__)
-#error "Target can't be both X and Windows"
+ #error "Target can't be both X and Windows"
#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
- !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \
- !defined(__WXMGL__) && !defined(__WXX11__) && wxUSE_GUI
-#ifdef __UNIX__
-#error "No Target! You should use wx-config program for compilation flags!"
-#else // !Unix
-#error "No Target! You should use supplied makefiles for compilation!"
-#endif // Unix/!Unix
+ !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__WXCOCOA__) && \
+ !defined(__X__) && !defined(__WXMGL__) && !defined(__WXX11__) && \
+ wxUSE_GUI
+ #ifdef __UNIX__
+ #error "No Target! You should use wx-config program for compilation flags!"
+ #else // !Unix
+ #error "No Target! You should use supplied makefiles for compilation!"
+ #endif // Unix/!Unix
+#endif
+
+#ifndef __WXWINDOWS__
+ #define __WXWINDOWS__ 1
+#endif
+
+#ifndef wxUSE_BASE
+ // by default consider that this is a monolithic build
+ #define wxUSE_BASE 1
+#endif
+
+#if !wxUSE_GUI && !defined(__WXBASE__)
+ #define __WXBASE__
#endif
// include the feature test macros
// suppress some Visual C++ warnings
#ifdef __VISUALC__
+ // the only "real" warning here is 4244 but there arej ust too many of them
+ // in our code... one day someone should go and fix them but until then...
# pragma warning(disable:4201) // nonstandard extension used: nameless struct/union
# pragma warning(disable:4244) // conversion from double to float
-# pragma warning(disable:4100) // unreferenced formal parameter
+# pragma warning(disable:4710) // function not inlined
+# pragma warning(disable:4097) // typedef used as class
# pragma warning(disable:4511) // copy ctor couldn't be generated
# pragma warning(disable:4512) // operator=() couldn't be generated
-# pragma warning(disable:4699) // using precompiled header
-# pragma warning(disable:4134) // conversion between pointers to members of same class
-# pragma warning(disable:4710) // function not inlined
#ifndef WIN32
# pragma warning(disable:4135) // conversion between different integral types
# pragma warning(disable:4769) // assignment of near pointer to long integer
# pragma suppress 571 // Virtual function hiding
#endif // __SALFORDC__
+// suppress some Borland C++ warnings
+#ifdef __BORLANDC__
+# pragma warn -inl // Functions containing reserved words and certain constructs are not expanded inline
+#endif // __BORLANDC__
+
// ----------------------------------------------------------------------------
// wxWindows version and compatibility defines
// ----------------------------------------------------------------------------
#include "wx/version.h"
-// possibility to build non GUI apps is new, so don't burden ourselves with
-// compatibility code
-#if !wxUSE_GUI
-#undef WXWIN_COMPATIBILITY_2
-#undef WXWIN_COMPATIBILITY_2_2
-
-#define WXWIN_COMPATIBILITY_2 0
-#define WXWIN_COMPATIBILITY_2_2 0
-#endif // !GUI
-
// ============================================================================
// non portable C++ features
// ============================================================================
// compiler defects workarounds
// ----------------------------------------------------------------------------
-#if defined(__VISUALC__) && !defined(WIN32)
+#if defined(__VISUALC__) && !defined(WIN32) && !defined(__WXWINCE__)
// VC1.5 does not have LPTSTR type
#define LPTSTR LPSTR
#define LPCTSTR LPCSTR
// check for native bool type and TRUE/FALSE constants
// ----------------------------------------------------------------------------
-// define boolean constants if not done yet
-#ifndef TRUE
- #define TRUE 1
-#endif
-
-#ifndef FALSE
- #define FALSE 0
-#endif
-
// Add more tests here for Windows compilers that already define bool
// (under Unix, configure tests for this)
#ifndef HAVE_BOOL
#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
// Watcom 11+ supports bool
#define HAVE_BOOL
- #elif defined(__GNUWIN32__)
+ #elif defined(__DIGITALMARS__)
+ // DigitalMars supports bool
+ #define HAVE_BOOL
+ #elif defined(__GNUWIN32__) || defined(__MINGW32__) || defined(__CYGWIN__)
// Cygwin supports bool
#define HAVE_BOOL
#elif defined(__VISAGECPP__)
#if __IBMCPP__ < 400
typedef unsigned long bool;
+ #define true ((bool)1)
+ #define false ((bool)0)
#endif
#define HAVE_BOOL
#endif // compilers
// NB: of course, this doesn't replace the standard type, because, for
// example, overloading based on bool/int parameter doesn't work and
// so should be avoided in portable programs
-typedef unsigned int bool;
+ typedef unsigned int bool;
#endif // bool
+// deal with TRUE/true stuff: we assume that if the compiler supports bool, it
+// supports true/false as well and that, OTOH, if it does _not_ support bool,
+// it doesn't support these keywords (this is less sure, in particular VC++
+// 4.x could be a problem here)
+#ifndef HAVE_BOOL
+ #define true ((bool)1)
+ #define false ((bool)0)
+#endif
+
+// for backwards compatibility, also define TRUE and FALSE
+//
+// note that these definitions should work both in C++ and C code, so don't
+// use true/false below
+#ifndef TRUE
+ #define TRUE 1
+#endif
+
+#ifndef FALSE
+ #define FALSE 0
+#endif
+
typedef short int WXTYPE;
// special care should be taken with this type under Windows where the real
// window id is unsigned, so we must always do the cast before comparing them
// (or else they would be always different!). Usign wxGetWindowId() which does
// the cast itself is recommended. Note that this type can't be unsigned
-// because -1 is a valid (and largely used) value for window id.
+// because wxID_ANY == -1 is a valid (and largely used) value for window id.
typedef int wxWindowID;
// ----------------------------------------------------------------------------
// other feature tests
// ----------------------------------------------------------------------------
- // Every ride down a slippery slope begins with a single step..
- //
- // Yes, using nested classes is indeed against our coding standards in
- // general, but there are places where you can use them to advantage
- // without totally breaking ports that cannot use them. If you do, then
- // wrap it in this guard, but such cases should still be relatively rare.
-
+// Every ride down a slippery slope begins with a single step..
+//
+// Yes, using nested classes is indeed against our coding standards in
+// general, but there are places where you can use them to advantage
+// without totally breaking ports that cannot use them. If you do, then
+// wrap it in this guard, but such cases should still be relatively rare.
#ifndef __WIN16__
-#define wxUSE_NESTED_CLASSES 1
+ #define wxUSE_NESTED_CLASSES 1
#else
-#define wxUSE_NESTED_CLASSES 0
+ #define wxUSE_NESTED_CLASSES 0
+#endif
+
+// check for explicit keyword support
+#ifndef HAVE_EXPLICIT
+ #if defined(__VISUALC__) && (__VISUALC__ >= 1100)
+ // VC++ 6.0 and 5.0 have explicit (what about earlier versions?)
+ #define HAVE_EXPLICIT
+ #elif ( defined(__MINGW32__) || defined(__CYGWIN32__) ) \
+ && wxCHECK_GCC_VERSION(2, 95)
+ // GCC 2.95 has explicit, what about earlier versions?
+ #define HAVE_EXPLICIT
+ #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x0520)
+ // BC++ 4.52 doesn't support explicit, CBuilder 1 does
+ #define HAVE_EXPLICIT
+ #elif defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+ // Metrowerks CW6 or higher has explicit
+ #define HAVE_EXPLICIT
+ #elif defined(__DIGITALMARS__)
+ #define HAVE_EXPLICIT
+ #endif
+#endif // !HAVE_EXPLICIT
+
+#ifdef HAVE_EXPLICIT
+ #define wxEXPLICIT explicit
+#else // !HAVE_EXPLICIT
+ #define wxEXPLICIT
+#endif // HAVE_EXPLICIT/!HAVE_EXPLICIT
+
+// check for static/const/reinterpret_cast<>()
+#ifndef HAVE_STATIC_CAST
+ #if defined(__VISUALC__) && (__VISUALC__ >= 1100)
+ // VC++ 6.0 and 5.0 have C++ casts (what about earlier versions?)
+ #define HAVE_CXX_CASTS
+ #elif ( defined(__MINGW32__) || defined(__CYGWIN32__) ) \
+ && wxCHECK_GCC_VERSION(2, 95)
+ // GCC 2.95 has C++ casts, what about earlier versions?
+ #define HAVE_CXX_CASTS
+ #endif
+#endif // HAVE_STATIC_CAST
+
+#ifdef HAVE_CXX_CASTS
+ #ifndef HAVE_CONST_CAST
+ #define HAVE_CONST_CAST
+ #endif
+#endif // HAVE_CXX_CASTS
+
+#ifndef HAVE_STD_WSTRING
+ #if defined(__VISUALC__) && (__VISUALC__ >= 1100)
+ // VC++ 6.0 and 5.0 have std::wstring (what about earlier versions?)
+ #define HAVE_STD_WSTRING
+ #elif ( defined(__MINGW32__) || defined(__CYGWIN32__) ) \
+ && wxCHECK_GCC_VERSION(3, 1)
+ // GCC 3.1 has std::wstring; 3.0 never was in MinGW, 2.95 hasn't it
+ #define HAVE_STD_WSTRING
+ #endif
+#endif
+
+#ifndef HAVE_STD_STRING_COMPARE
+ #if defined(__VISUALC__) && (__VISUALC__ >= 1100)
+ // VC++ 6.0 and 5.0 have std::string::compare
+ // (what about earlier versions?)
+ #define HAVE_STD_STRING_COMPARE
+ #elif ( defined(__MINGW32__) || defined(__CYGWIN32__) ) \
+ && wxCHECK_GCC_VERSION(3, 1)
+ // GCC 3.1 has std::string::compare;
+ // 3.0 never was in MinGW, 2.95 hasn't it
+ #define HAVE_STD_STRING_COMPARE
+ #endif
#endif
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// stdcall is used for all functions called by Windows under Windows
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__)
#if defined(__GNUWIN32__)
#define wxSTDCALL __attribute__((stdcall))
#else
#define WXEXPORT _Export
#define WXIMPORT _Export
#endif
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) || defined(__WXCOCOA__)
#ifdef __MWERKS__
#define WXEXPORT __declspec(export)
#define WXIMPORT __declspec(import)
#define WXIMPORT
#endif
-// WXDLLEXPORT maps to export declaration when building the DLL, to import
-// declaration if using it or to nothing at all if we don't use wxWin DLL
+/*
+ We support building wxWindows as a set of several libraries but we don't
+ support arbitrary combinations of libs/DLLs: either we build all of them as
+ DLLs (in which case WXMAKINGDLL is defined) or none (it isn't).
+
+ However we have a problem because we need separate WXDLLEXPORT versions for
+ different libraries as, for example, wxString class should be dllexported
+ when compiled in wxBase and dllimported otherwise, so we do define separate
+ WXMAKING/USINGDLL_XYZ constants for each component XYZ.
+ */
#ifdef WXMAKINGDLL
- #define WXDLLEXPORT WXEXPORT
- #define WXDLLEXPORT_DATA(type) WXEXPORT type
- #define WXDLLEXPORT_CTORFN
+ #if wxUSE_BASE
+ #define WXMAKINGDLL_BASE
+ #endif
+
+ #define WXMAKINGDLL_NET
+ #define WXMAKINGDLL_CORE
+ #define WXMAKINGDLL_ADV
+ #define WXMAKINGDLL_ODBC
+ #define WXMAKINGDLL_DBGRID
+ #define WXMAKINGDLL_HTML
+ #define WXMAKINGDLL_XML
+#endif // WXMAKINGDLL
+
+// WXDLLEXPORT maps to export declaration when building the DLL, to import
+// declaration if using it or to nothing at all if we don't use wxWin as DLL
+#ifdef WXMAKINGDLL_BASE
+ #define WXDLLIMPEXP_BASE WXEXPORT
+ #define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type
#elif defined(WXUSINGDLL)
- #define WXDLLEXPORT WXIMPORT
- #define WXDLLEXPORT_DATA(type) WXIMPORT type
- #define WXDLLEXPORT_CTORFN
+ #define WXDLLIMPEXP_BASE WXIMPORT
+ #define WXDLLIMPEXP_DATA_BASE(type) WXIMPORT type
#else // not making nor using DLL
- #define WXDLLEXPORT
- #define WXDLLEXPORT_DATA(type) type
- #define WXDLLEXPORT_CTORFN
+ #define WXDLLIMPEXP_BASE
+ #define WXDLLIMPEXP_DATA_BASE(type) type
#endif
-// For ostream, istream ofstream
-#if defined(__BORLANDC__) && defined( _RTLDLL )
-# define WXDLLIMPORT __import
-#else
-# define WXDLLIMPORT
+#ifdef WXMAKINGDLL_NET
+ #define WXDLLIMPEXP_NET WXEXPORT
+ #define WXDLLIMPEXP_DATA_NET(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+ #define WXDLLIMPEXP_NET WXIMPORT
+ #define WXDLLIMPEXP_DATA_NET(type) WXIMPORT type
+#else // not making nor using DLL
+ #define WXDLLIMPEXP_NET
+ #define WXDLLIMPEXP_DATA_NET(type) type
#endif
-#ifdef __cplusplus
-class WXDLLEXPORT wxObject;
-class WXDLLEXPORT wxEvent;
+#ifdef WXMAKINGDLL_CORE
+ #define WXDLLIMPEXP_CORE WXEXPORT
+ #define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+ #define WXDLLIMPEXP_CORE WXIMPORT
+ #define WXDLLIMPEXP_DATA_CORE(type) WXIMPORT type
+#else // not making nor using DLL
+ #define WXDLLIMPEXP_CORE
+ #define WXDLLIMPEXP_DATA_CORE(type) type
#endif
-// symbolic constant used by all Find()-like functions returning positive
-// integer on success as failure indicator
-#define wxNOT_FOUND (-1)
+#ifdef WXMAKINGDLL_ADV
+ #define WXDLLIMPEXP_ADV WXEXPORT
+ #define WXDLLIMPEXP_DATA_ADV(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+ #define WXDLLIMPEXP_ADV WXIMPORT
+ #define WXDLLIMPEXP_DATA_ADV(type) WXIMPORT type
+#else // not making nor using DLL
+ #define WXDLLIMPEXP_ADV
+ #define WXDLLIMPEXP_DATA_ADV(type) type
+#endif
+
+#ifdef WXMAKINGDLL_ODBC
+ #define WXDLLIMPEXP_ODBC WXEXPORT
+ #define WXDLLIMPEXP_DATA_ODBC(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+ #define WXDLLIMPEXP_ODBC WXIMPORT
+ #define WXDLLIMPEXP_DATA_ODBC(type) WXIMPORT type
+#else // not making nor using DLL
+ #define WXDLLIMPEXP_ODBC
+ #define WXDLLIMPEXP_DATA_ODBC(type) type
+#endif
+
+#ifdef WXMAKINGDLL_DBGRID
+ #define WXDLLIMPEXP_DBGRID WXEXPORT
+ #define WXDLLIMPEXP_DATA_DBGRID(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+ #define WXDLLIMPEXP_DBGRID WXIMPORT
+ #define WXDLLIMPEXP_DATA_DBGRID(type) WXIMPORT type
+#else // not making nor using DLL
+ #define WXDLLIMPEXP_DBGRID
+ #define WXDLLIMPEXP_DATA_DBGRID(type) type
+#endif
+
+#ifdef WXMAKINGDLL_HTML
+ #define WXDLLIMPEXP_HTML WXEXPORT
+ #define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+ #define WXDLLIMPEXP_HTML WXIMPORT
+ #define WXDLLIMPEXP_DATA_HTML(type) WXIMPORT type
+#else // not making nor using DLL
+ #define WXDLLIMPEXP_HTML
+ #define WXDLLIMPEXP_DATA_HTML(type) type
+#endif
+
+#ifdef WXMAKINGDLL_GL
+ #define WXDLLIMPEXP_GL WXEXPORT
+#elif defined(WXUSINGDLL)
+ #define WXDLLIMPEXP_GL WXIMPORT
+#else // not making nor using DLL
+ #define WXDLLIMPEXP_GL
+#endif
+
+#ifdef WXMAKINGDLL_XML
+ #define WXDLLIMPEXP_XML WXEXPORT
+#elif defined(WXUSINGDLL)
+ #define WXDLLIMPEXP_XML WXIMPORT
+#else // not making nor using DLL
+ #define WXDLLIMPEXP_XML
+#endif
+
+// for backwards compatibility, define suffix-less versions too
+#define WXDLLEXPORT WXDLLIMPEXP_CORE
+#define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE
// ----------------------------------------------------------------------------
// Very common macros
// ----------------------------------------------------------------------------
+// Printf-like attribute definitions to obtain warnings with GNU C/C++
+#if defined(__GNUC__) && !wxUSE_UNICODE
+# ifndef ATTRIBUTE_PRINTF
+# define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
+# define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
+# define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
+# define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
+# define ATTRIBUTE_PRINTF_4 ATTRIBUTE_PRINTF(4, 5)
+# define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6)
+# endif /* ATTRIBUTE_PRINTF */
+#else
+# ifndef ATTRIBUTE_PRINTF
+# define ATTRIBUTE_PRINTF
+# define ATTRIBUTE_PRINTF_1
+# define ATTRIBUTE_PRINTF_2
+# define ATTRIBUTE_PRINTF_3
+# define ATTRIBUTE_PRINTF_4
+# define ATTRIBUTE_PRINTF_5
+# endif /* ATTRIBUTE_PRINTF */
+#endif
+
+// Macro to issue warning when using deprecated functions with gcc3 or MSVC7:
+#if wxCHECK_GCC_VERSION(3, 1)
+ #define wxDEPRECATED(x) x __attribute__ ((deprecated))
+#elif defined(__VISUALC__) && (__VISUALC__ >= 1300)
+ #define wxDEPRECATED(x) __declspec(deprecated) x
+#else
+ #define wxDEPRECATED(x) x
+#endif
+
// everybody gets the assert and other debug macros
#ifdef __cplusplus
#include "wx/debug.h"
// size of statically declared array
#define WXSIZEOF(array) (sizeof(array)/sizeof(array[0]))
+// helper macros to be able to define unique/anonymous objects: this works by
+// appending the current line number to the given identifier to reduce the
+// probability of the conflict (it may still happen if this is used in the
+// headers, hence you should avoid doing it or provide unique prefixes then)
+#define wxCONCAT(text, line) text ## line
+#define wxCONCAT_LINE2(text, line) wxCONCAT(text, line)
+#define wxCONCAT_LINE(text) wxCONCAT_LINE2(text, __LINE__)
+#define wxMAKE_UNIQUE_NAME(text) wxCONCAT_LINE(text)
+
+// symbolic constant used by all Find()-like functions returning positive
+// integer on success as failure indicator
+#define wxNOT_FOUND (-1)
+
// ----------------------------------------------------------------------------
// compiler specific settings
// ----------------------------------------------------------------------------
# endif
#endif
-// Callback function type definition
-#ifdef __cplusplus
-typedef void (*wxFunction) (wxObject&, wxEvent&);
-#endif
-
// ----------------------------------------------------------------------------
// OS mnemonics -- Identify the running OS (useful for Windows)
// ----------------------------------------------------------------------------
wxWIN32S, // Windows 32S API
wxWIN95, // Windows 95
wxWIN386, // Watcom 32-bit supervisor modus
+ wxWINDOWS_CE, // Windows CE
wxMGL_UNIX, // MGL with direct hardware access
wxMGL_X, // MGL on X
wxMGL_WIN32, // MGL on Win32
// precision, so use the IEEE types for storage , and this for calculations
typedef float wxFloat32 ;
-#if defined( __WXMAC__ ) && defined (__MWERKS__)
+#if (defined( __WXMAC__ ) || defined(__WXCOCOA__)) && defined (__MWERKS__)
typedef short double wxFloat64;
#else
typedef double wxFloat64;
#define wxUINT64_SWAP_ON_BE(val) (val)
#endif
+// Macros to convert from unsigned long to void pointer.
+// High order truncation occurs if the respective type is not large enough.
+#define WXPTRULONGSLICE (((wxBYTE_ORDER==wxBIG_ENDIAN)&&(sizeof(void*)==8)&&(sizeof(unsigned long)<8))?1:0)
+#define wxPtrToULong(p) (((unsigned long*)(&(p)))[WXPTRULONGSLICE])
+#define wxULongToPtr(p,n) (p=NULL,wxPtrToULong(p)=(unsigned long)(n),p)
+
// ----------------------------------------------------------------------------
// Geometric flags
// ----------------------------------------------------------------------------
#define wxSTATIC_BORDER wxBORDER_STATIC
#define wxNO_BORDER wxBORDER_NONE
-// Override CTL3D etc. control colour processing to allow own background
-// colour.
-// Override CTL3D or native 3D styles for children
-#define wxNO_3D 0x00800000
-
-// OBSOLETE - use wxNO_3D instead
-#define wxUSER_COLOURS wxNO_3D
-
// wxALWAYS_SHOW_SB: instead of hiding the scrollbar when it is not needed,
// disable it - but still show (see also wxLB_ALWAYS_SB style)
//
-// NB: as this style is only supported by wxUniversal so far as it doesn't use
-// wxUSER_COLOURS/wxNO_3D, we reuse the same style value
+// NB: as this style is only supported by wxUniversal and wxMSW so far
#define wxALWAYS_SHOW_SB 0x00800000
// Clip children when painting, which reduces flicker in e.g. frames and
// parent is destroyed before the child
#define wxWS_EX_TRANSIENT 0x00000004
+// don't paint the window background, we'll assume it will
+// be done by a theming engine. This is not yet used but could
+// possibly be made to work in the future, at least on Windows
+#define wxWS_EX_THEMED_BACKGROUND 0x00000008
+
+// this window should always process idle events
+#define wxWS_EX_PROCESS_IDLE 0x00000010
+
+// this window should always process UI update events
+#define wxWS_EX_PROCESS_UI_UPDATES 0x00000020
+
// Use this style to add a context-sensitive help to the window (currently for
// Win32 only and it doesn't work if wxMINIMIZE_BOX or wxMAXIMIZE_BOX are used)
#define wxFRAME_EX_CONTEXTHELP 0x00000004
#define wxICONIZE 0x4000
#define wxMINIMIZE wxICONIZE
#define wxMAXIMIZE 0x2000
- // free flag value: 0x1000
+#define wxCLOSE_BOX 0x1000
+
#define wxSYSTEM_MENU 0x0800
#define wxMINIMIZE_BOX 0x0400
#define wxMAXIMIZE_BOX 0x0200
#define wxDIALOG_NO_PARENT 0x0001 // Don't make owned by apps top window
#define wxFRAME_NO_TASKBAR 0x0002 // No taskbar button (MSW only)
#define wxFRAME_TOOL_WINDOW 0x0004 // No taskbar button, no system menu
+#define wxFRAME_FLOAT_ON_PARENT 0x0008 // Always above its parent
+#define wxFRAME_SHAPED 0x0010 // Create a window that is able to be shaped
// deprecated versions defined for compatibility reasons
#define wxRESIZE_BOX wxMAXIMIZE_BOX
#define wxTHICK_FRAME wxRESIZE_BORDER
-#define wxFRAME_FLOAT_ON_PARENT wxFRAME_TOOL_WINDOW
// obsolete styles, unused any more
#define wxDIALOG_MODAL 0x0020 // free flag value 0x0020
-#define wxDIALOG_MODELESS 0x0000
+#define wxDIALOG_MODELESS 0
+#define wxNO_3D 0
+#define wxUSER_COLOURS 0
+
/*
* MDI parent frame style flags
#define wxFRAME_NO_WINDOW_MENU 0x0100
-#if WXWIN_COMPATIBILITY
-#define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE
-#endif
-
#define wxDEFAULT_FRAME_STYLE \
(wxSYSTEM_MENU | wxRESIZE_BORDER | \
- wxMINIMIZE_BOX | wxMAXIMIZE_BOX | \
+ wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxCLOSE_BOX | \
wxCAPTION | wxCLIP_CHILDREN)
-#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMGL__)
-# define wxDEFAULT_DIALOG_STYLE (wxSYSTEM_MENU | wxCAPTION)
-#else
-// Under Unix, the dialogs don't have a system menu. Specifying wxSYSTEM_MENU
-// here will make a close button appear.
-# define wxDEFAULT_DIALOG_STYLE wxCAPTION
-#endif
+#define wxDEFAULT_DIALOG_STYLE (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX)
/*
* wxExtDialog style flags
* wxRadioButton style flag
*/
#define wxRB_GROUP 0x0004
+#define wxRB_SINGLE 0x0008
/*
* wxGauge flags
#define wxSP_ARROW_KEYS 0x1000
#define wxSP_WRAP 0x2000
-/*
- * wxSplitterWindow flags
- */
-#define wxSP_NOBORDER 0x0000
-#define wxSP_NOSASH 0x0010
-#define wxSP_BORDER 0x0020
-#define wxSP_PERMIT_UNSPLIT 0x0040
-#define wxSP_LIVE_UPDATE 0x0080
-#define wxSP_3DSASH 0x0100
-#define wxSP_3DBORDER 0x0200
-#define wxSP_FULLSASH 0x0400
-#define wxSP_3D (wxSP_3DBORDER | wxSP_3DSASH)
-#define wxSP_SASH_AQUA 0x0800
-
/*
* wxNotebook flags
*/
*/
#define wxTC_RIGHTJUSTIFY 0x0010
#define wxTC_FIXEDWIDTH 0x0020
-#define wxTC_OWNERDRAW 0x0040
+#define wxTC_TOP 0x0000 // default
+#define wxTC_LEFT 0x0020
+#define wxTC_RIGHT 0x0040
+#define wxTC_BOTTOM 0x0080
#define wxTC_MULTILINE wxNB_MULTILINE
-
-// wxToolBar style flags
-#define wxTB_HORIZONTAL wxHORIZONTAL // == 0x0004
-#define wxTB_VERTICAL wxVERTICAL // == 0x0008
-#define wxTB_3DBUTTONS 0x0010
-#define wxTB_FLAT 0x0020 // supported only under Win98+/GTK
-#define wxTB_DOCKABLE 0x0040 // use native docking under GTK
-#define wxTB_NOICONS 0x0080 // don't show the icons
-#define wxTB_TEXT 0x0100 // show the text
-#define wxTB_NODIVIDER 0x0200 // don't show the divider (Windows)
-#define wxTB_NOALIGN 0x0400 // no automatic alignment (Windows)
+#define wxTC_OWNERDRAW 0x0200
/*
* wxStatusBar95 flags
// be modal. No progress will then be made at all.
#define wxPD_REMAINING_TIME 0x0040
+/*
+ * wxDirDialog styles
+ */
+
+#define wxDD_NEW_DIR_BUTTON 0x0080
+
/*
* extended dialog specifiers. these values are stored in a different
* flag and thus do not overlap with other style flags. note that these
// standard IDs
// ----------------------------------------------------------------------------
+// any id: means that we don't care about the id, whether when installing an
+// event handler or when creating a new window
+enum
+{
+ wxID_ANY = -1
+};
+
// id for a separator line in the menu (invalid for normal item)
-#define wxID_SEPARATOR (-1)
+enum
+{
+ wxID_SEPARATOR = -1
+};
// Standard menu IDs
-#define wxID_LOWEST 4999
-
-#define wxID_OPEN 5000
-#define wxID_CLOSE 5001
-#define wxID_NEW 5002
-#define wxID_SAVE 5003
-#define wxID_SAVEAS 5004
-#define wxID_REVERT 5005
-#define wxID_EXIT 5006
-#define wxID_UNDO 5007
-#define wxID_REDO 5008
-#define wxID_HELP 5009
-#define wxID_PRINT 5010
-#define wxID_PRINT_SETUP 5011
-#define wxID_PREVIEW 5012
-#define wxID_ABOUT 5013
-#define wxID_HELP_CONTENTS 5014
-#define wxID_HELP_COMMANDS 5015
-#define wxID_HELP_PROCEDURES 5016
-#define wxID_HELP_CONTEXT 5017
-#define wxID_CLOSE_ALL 5018
-
-#define wxID_CUT 5030
-#define wxID_COPY 5031
-#define wxID_PASTE 5032
-#define wxID_CLEAR 5033
-#define wxID_FIND 5034
-#define wxID_DUPLICATE 5035
-#define wxID_SELECTALL 5036
-
-#define wxID_FILE1 5050
-#define wxID_FILE2 5051
-#define wxID_FILE3 5052
-#define wxID_FILE4 5053
-#define wxID_FILE5 5054
-#define wxID_FILE6 5055
-#define wxID_FILE7 5056
-#define wxID_FILE8 5057
-#define wxID_FILE9 5058
-
-// Standard button IDs
-#define wxID_OK 5100
-#define wxID_CANCEL 5101
-#define wxID_APPLY 5102
-#define wxID_YES 5103
-#define wxID_NO 5104
-#define wxID_STATIC 5105
-#define wxID_FORWARD 5106
-#define wxID_BACKWARD 5107
-#define wxID_DEFAULT 5108
-#define wxID_MORE 5109
-#define wxID_SETUP 5110
-#define wxID_RESET 5111
-#define wxID_CONTEXT_HELP 5112
-#define wxID_YESTOALL 5113
-#define wxID_NOTOALL 5114
-#define wxID_ABORT 5115
-#define wxID_RETRY 5116
-#define wxID_IGNORE 5117
-
-// System menu IDs (used by wxUniv):
-#define wxID_SYSTEM_MENU 5200
-#define wxID_CLOSE_FRAME 5201
-#define wxID_MOVE_FRAME 5202
-#define wxID_RESIZE_FRAME 5203
-#define wxID_MAXIMIZE_FRAME 5204
-#define wxID_ICONIZE_FRAME 5205
-#define wxID_RESTORE_FRAME 5206
-
-// IDs used by generic file dialog (13 consecutive starting from this value)
-#define wxID_FILEDLGG 5900
-
-#define wxID_HIGHEST 5999
+enum
+{
+ wxID_LOWEST = 4999,
+
+ wxID_OPEN,
+ wxID_CLOSE,
+ wxID_NEW,
+ wxID_SAVE,
+ wxID_SAVEAS,
+ wxID_REVERT,
+ wxID_EXIT,
+ wxID_UNDO,
+ wxID_REDO,
+ wxID_HELP,
+ wxID_PRINT,
+ wxID_PRINT_SETUP,
+ wxID_PREVIEW,
+ wxID_ABOUT,
+ wxID_HELP_CONTENTS,
+ wxID_HELP_COMMANDS,
+ wxID_HELP_PROCEDURES,
+ wxID_HELP_CONTEXT,
+ wxID_CLOSE_ALL,
+
+ wxID_CUT = 5030,
+ wxID_COPY,
+ wxID_PASTE,
+ wxID_CLEAR,
+ wxID_FIND,
+ wxID_DUPLICATE,
+ wxID_SELECTALL,
+ wxID_DELETE,
+ wxID_REPLACE,
+ wxID_REPLACE_ALL,
+ wxID_PROPERTIES,
+
+ wxID_VIEW_DETAILS,
+ wxID_VIEW_LARGEICONS,
+ wxID_VIEW_SMALLICONS,
+ wxID_VIEW_LIST,
+ wxID_VIEW_SORTDATE,
+ wxID_VIEW_SORTNAME,
+ wxID_VIEW_SORTSIZE,
+ wxID_VIEW_SORTTYPE,
+
+ wxID_FILE1 = 5050,
+ wxID_FILE2,
+ wxID_FILE3,
+ wxID_FILE4,
+ wxID_FILE5,
+ wxID_FILE6,
+ wxID_FILE7,
+ wxID_FILE8,
+ wxID_FILE9,
+
+ // Standard button IDs
+ wxID_OK = 5100,
+ wxID_CANCEL,
+ wxID_APPLY,
+ wxID_YES,
+ wxID_NO,
+ wxID_STATIC,
+ wxID_FORWARD,
+ wxID_BACKWARD,
+ wxID_DEFAULT,
+ wxID_MORE,
+ wxID_SETUP,
+ wxID_RESET,
+ wxID_CONTEXT_HELP,
+ wxID_YESTOALL,
+ wxID_NOTOALL,
+ wxID_ABORT,
+ wxID_RETRY,
+ wxID_IGNORE,
+
+ // System menu IDs (used by wxUniv):
+ wxID_SYSTEM_MENU = 5200,
+ wxID_CLOSE_FRAME,
+ wxID_MOVE_FRAME,
+ wxID_RESIZE_FRAME,
+ wxID_MAXIMIZE_FRAME,
+ wxID_ICONIZE_FRAME,
+ wxID_RESTORE_FRAME,
+
+ // IDs used by generic file dialog (13 consecutive starting from this value)
+ wxID_FILEDLGG = 5900,
+
+ wxID_HIGHEST = 5999
+};
// ----------------------------------------------------------------------------
-// constants
+// other constants
// ----------------------------------------------------------------------------
// menu and toolbar item kinds
// GDI descriptions
// ----------------------------------------------------------------------------
-enum {
-// Text font families
- wxDEFAULT = 70,
- wxDECORATIVE,
- wxROMAN,
- wxSCRIPT,
- wxSWISS,
- wxMODERN,
- wxTELETYPE, /* @@@@ */
-
-// Proportional or Fixed width fonts (not yet used)
- wxVARIABLE = 80,
- wxFIXED,
-
- wxNORMAL = 90,
- wxLIGHT,
- wxBOLD,
-// Also wxNORMAL for normal (non-italic text)
- wxITALIC,
- wxSLANT,
-
-// Pen styles
- wxSOLID = 100,
- wxDOT,
- wxLONG_DASH,
- wxSHORT_DASH,
- wxDOT_DASH,
- wxUSER_DASH,
-
- wxTRANSPARENT,
-
-// Brush & Pen Stippling. Note that a stippled pen cannot be dashed!!
-// Note also that stippling a Pen IS meaningfull, because a Line is
- wxSTIPPLE_MASK_OPAQUE, //mask is used for blitting monochrome using text fore and back ground colors
- wxSTIPPLE_MASK, //mask is used for masking areas in the stipple bitmap (TO DO)
-// drawn with a Pen, and without any Brush -- and it can be stippled.
- wxSTIPPLE = 110,
- wxBDIAGONAL_HATCH,
- wxCROSSDIAG_HATCH,
- wxFDIAGONAL_HATCH,
- wxCROSS_HATCH,
- wxHORIZONTAL_HATCH,
- wxVERTICAL_HATCH,
-#define IS_HATCH(s) ((s)>=wxBDIAGONAL_HATCH && (s)<=wxVERTICAL_HATCH)
-
- wxJOIN_BEVEL = 120,
- wxJOIN_MITER,
- wxJOIN_ROUND,
-
- wxCAP_ROUND = 130,
- wxCAP_PROJECTING,
- wxCAP_BUTT
+enum
+{
+ // Text font families
+ wxDEFAULT = 70,
+ wxDECORATIVE,
+ wxROMAN,
+ wxSCRIPT,
+ wxSWISS,
+ wxMODERN,
+ wxTELETYPE, /* @@@@ */
+
+ // Proportional or Fixed width fonts (not yet used)
+ wxVARIABLE = 80,
+ wxFIXED,
+
+ wxNORMAL = 90,
+ wxLIGHT,
+ wxBOLD,
+ // Also wxNORMAL for normal (non-italic text)
+ wxITALIC,
+ wxSLANT,
+
+ // Pen styles
+ wxSOLID = 100,
+ wxDOT,
+ wxLONG_DASH,
+ wxSHORT_DASH,
+ wxDOT_DASH,
+ wxUSER_DASH,
+
+ wxTRANSPARENT,
+
+ // Brush & Pen Stippling. Note that a stippled pen cannot be dashed!!
+ // Note also that stippling a Pen IS meaningfull, because a Line is
+ wxSTIPPLE_MASK_OPAQUE, //mask is used for blitting monochrome using text fore and back ground colors
+ wxSTIPPLE_MASK, //mask is used for masking areas in the stipple bitmap (TO DO)
+ // drawn with a Pen, and without any Brush -- and it can be stippled.
+ wxSTIPPLE = 110,
+ wxBDIAGONAL_HATCH,
+ wxCROSSDIAG_HATCH,
+ wxFDIAGONAL_HATCH,
+ wxCROSS_HATCH,
+ wxHORIZONTAL_HATCH,
+ wxVERTICAL_HATCH,
+
+ wxJOIN_BEVEL = 120,
+ wxJOIN_MITER,
+ wxJOIN_ROUND,
+
+ wxCAP_ROUND = 130,
+ wxCAP_PROJECTING,
+ wxCAP_BUTT
};
+// VZ: why doesn't it start with "wx"? FIXME
+#define IS_HATCH(s) ((s)>=wxBDIAGONAL_HATCH && (s)<=wxVERTICAL_HATCH)
// Logical ops
typedef enum
wxSET, wxROP_WHITE = wxSET, wxBLIT_WHITENESS = wxSET // 1
} form_ops_t;
-/* Flood styles */
-#define wxFLOOD_SURFACE 1
-#define wxFLOOD_BORDER 2
+// Flood styles
+enum
+{
+ wxFLOOD_SURFACE = 1,
+ wxFLOOD_BORDER
+};
-/* Polygon filling mode */
-#define wxODDEVEN_RULE 1
-#define wxWINDING_RULE 2
+// Polygon filling mode
+enum
+{
+ wxODDEVEN_RULE = 1,
+ wxWINDING_RULE
+};
-/* ToolPanel in wxFrame */
-#define wxTOOL_TOP 1
-#define wxTOOL_BOTTOM 2
-#define wxTOOL_LEFT 3
-#define wxTOOL_RIGHT 4
+// ToolPanel in wxFrame (VZ: unused?)
+enum
+{
+ wxTOOL_TOP = 1,
+ wxTOOL_BOTTOM,
+ wxTOOL_LEFT,
+ wxTOOL_RIGHT
+};
// the values of the format constants should be the same as correspondign
// CF_XXX constants in Windows API
wxDF_FILENAME = 15, /* CF_HDROP */
wxDF_LOCALE = 16,
wxDF_PRIVATE = 20,
+ wxDF_HTML = 30, /* Note: does not correspond to CF_ constant */
wxDF_MAX
};
-/* Virtual keycodes */
-
+// Virtual keycodes
enum wxKeyCode
{
- WXK_BACK = 8,
- WXK_TAB = 9,
- WXK_RETURN = 13,
- WXK_ESCAPE = 27,
- WXK_SPACE = 32,
- WXK_DELETE = 127,
-
- WXK_START = 300,
- WXK_LBUTTON,
- WXK_RBUTTON,
- WXK_CANCEL,
- WXK_MBUTTON,
- WXK_CLEAR,
- WXK_SHIFT,
- WXK_ALT,
- WXK_CONTROL,
- WXK_MENU,
- WXK_PAUSE,
- WXK_CAPITAL,
- WXK_PRIOR, // Page up
- WXK_NEXT, // Page down
- WXK_END,
- WXK_HOME,
- WXK_LEFT,
- WXK_UP,
- WXK_RIGHT,
- WXK_DOWN,
- WXK_SELECT,
- WXK_PRINT,
- WXK_EXECUTE,
- WXK_SNAPSHOT,
- WXK_INSERT,
- WXK_HELP,
- WXK_NUMPAD0,
- WXK_NUMPAD1,
- WXK_NUMPAD2,
- WXK_NUMPAD3,
- WXK_NUMPAD4,
- WXK_NUMPAD5,
- WXK_NUMPAD6,
- WXK_NUMPAD7,
- WXK_NUMPAD8,
- WXK_NUMPAD9,
- WXK_MULTIPLY,
- WXK_ADD,
- WXK_SEPARATOR,
- WXK_SUBTRACT,
- WXK_DECIMAL,
- WXK_DIVIDE,
- WXK_F1,
- WXK_F2,
- WXK_F3,
- WXK_F4,
- WXK_F5,
- WXK_F6,
- WXK_F7,
- WXK_F8,
- WXK_F9,
- WXK_F10,
- WXK_F11,
- WXK_F12,
- WXK_F13,
- WXK_F14,
- WXK_F15,
- WXK_F16,
- WXK_F17,
- WXK_F18,
- WXK_F19,
- WXK_F20,
- WXK_F21,
- WXK_F22,
- WXK_F23,
- WXK_F24,
- WXK_NUMLOCK,
- WXK_SCROLL,
- WXK_PAGEUP,
- WXK_PAGEDOWN,
-
- WXK_NUMPAD_SPACE,
- WXK_NUMPAD_TAB,
- WXK_NUMPAD_ENTER,
- WXK_NUMPAD_F1,
- WXK_NUMPAD_F2,
- WXK_NUMPAD_F3,
- WXK_NUMPAD_F4,
- WXK_NUMPAD_HOME,
- WXK_NUMPAD_LEFT,
- WXK_NUMPAD_UP,
- WXK_NUMPAD_RIGHT,
- WXK_NUMPAD_DOWN,
- WXK_NUMPAD_PRIOR,
- WXK_NUMPAD_PAGEUP,
- WXK_NUMPAD_NEXT,
- WXK_NUMPAD_PAGEDOWN,
- WXK_NUMPAD_END,
- WXK_NUMPAD_BEGIN,
- WXK_NUMPAD_INSERT,
- WXK_NUMPAD_DELETE,
- WXK_NUMPAD_EQUAL,
- WXK_NUMPAD_MULTIPLY,
- WXK_NUMPAD_ADD,
- WXK_NUMPAD_SEPARATOR,
- WXK_NUMPAD_SUBTRACT,
- WXK_NUMPAD_DECIMAL,
- WXK_NUMPAD_DIVIDE
+ WXK_BACK = 8,
+ WXK_TAB = 9,
+ WXK_RETURN = 13,
+ WXK_ESCAPE = 27,
+ WXK_SPACE = 32,
+ WXK_DELETE = 127,
+
+ WXK_START = 300,
+ WXK_LBUTTON,
+ WXK_RBUTTON,
+ WXK_CANCEL,
+ WXK_MBUTTON,
+ WXK_CLEAR,
+ WXK_SHIFT,
+ WXK_ALT,
+ WXK_CONTROL,
+ WXK_MENU,
+ WXK_PAUSE,
+ WXK_CAPITAL,
+ WXK_PRIOR, // Page up
+ WXK_NEXT, // Page down
+ WXK_END,
+ WXK_HOME,
+ WXK_LEFT,
+ WXK_UP,
+ WXK_RIGHT,
+ WXK_DOWN,
+ WXK_SELECT,
+ WXK_PRINT,
+ WXK_EXECUTE,
+ WXK_SNAPSHOT,
+ WXK_INSERT,
+ WXK_HELP,
+ WXK_NUMPAD0,
+ WXK_NUMPAD1,
+ WXK_NUMPAD2,
+ WXK_NUMPAD3,
+ WXK_NUMPAD4,
+ WXK_NUMPAD5,
+ WXK_NUMPAD6,
+ WXK_NUMPAD7,
+ WXK_NUMPAD8,
+ WXK_NUMPAD9,
+ WXK_MULTIPLY,
+ WXK_ADD,
+ WXK_SEPARATOR,
+ WXK_SUBTRACT,
+ WXK_DECIMAL,
+ WXK_DIVIDE,
+ WXK_F1,
+ WXK_F2,
+ WXK_F3,
+ WXK_F4,
+ WXK_F5,
+ WXK_F6,
+ WXK_F7,
+ WXK_F8,
+ WXK_F9,
+ WXK_F10,
+ WXK_F11,
+ WXK_F12,
+ WXK_F13,
+ WXK_F14,
+ WXK_F15,
+ WXK_F16,
+ WXK_F17,
+ WXK_F18,
+ WXK_F19,
+ WXK_F20,
+ WXK_F21,
+ WXK_F22,
+ WXK_F23,
+ WXK_F24,
+ WXK_NUMLOCK,
+ WXK_SCROLL,
+ WXK_PAGEUP,
+ WXK_PAGEDOWN,
+
+ WXK_NUMPAD_SPACE,
+ WXK_NUMPAD_TAB,
+ WXK_NUMPAD_ENTER,
+ WXK_NUMPAD_F1,
+ WXK_NUMPAD_F2,
+ WXK_NUMPAD_F3,
+ WXK_NUMPAD_F4,
+ WXK_NUMPAD_HOME,
+ WXK_NUMPAD_LEFT,
+ WXK_NUMPAD_UP,
+ WXK_NUMPAD_RIGHT,
+ WXK_NUMPAD_DOWN,
+ WXK_NUMPAD_PRIOR,
+ WXK_NUMPAD_PAGEUP,
+ WXK_NUMPAD_NEXT,
+ WXK_NUMPAD_PAGEDOWN,
+ WXK_NUMPAD_END,
+ WXK_NUMPAD_BEGIN,
+ WXK_NUMPAD_INSERT,
+ WXK_NUMPAD_DELETE,
+ WXK_NUMPAD_EQUAL,
+ WXK_NUMPAD_MULTIPLY,
+ WXK_NUMPAD_ADD,
+ WXK_NUMPAD_SEPARATOR,
+ WXK_NUMPAD_SUBTRACT,
+ WXK_NUMPAD_DECIMAL,
+ WXK_NUMPAD_DIVIDE,
+
+ WXK_WINDOWS_LEFT,
+ WXK_WINDOWS_RIGHT,
+ WXK_WINDOWS_MENU ,
+ WXK_COMMAND
};
-// Mapping modes (as per Windows)
-#define wxMM_TEXT 1
-#define wxMM_LOMETRIC 2
-#define wxMM_HIMETRIC 3
-#define wxMM_LOENGLISH 4
-#define wxMM_HIENGLISH 5
-#define wxMM_TWIPS 6
-#define wxMM_ISOTROPIC 7
-#define wxMM_ANISOTROPIC 8
+#if wxUSE_HOTKEY
+enum wxHotkeyModifier
+{
+ wxMOD_NONE = 0,
+ wxMOD_ALT = 1,
+ wxMOD_CONTROL = 2,
+ wxMOD_SHIFT = 4,
+ wxMOD_WIN = 8
+};
+#endif
-#define wxMM_POINTS 9
-#define wxMM_METRIC 10
+// Mapping modes (same values as used by Windows, don't change)
+enum
+{
+ wxMM_TEXT = 1,
+ wxMM_LOMETRIC,
+ wxMM_HIMETRIC,
+ wxMM_LOENGLISH,
+ wxMM_HIENGLISH,
+ wxMM_TWIPS,
+ wxMM_ISOTROPIC,
+ wxMM_ANISOTROPIC,
+ wxMM_POINTS,
+ wxMM_METRIC
+};
/* Shortcut for easier dialog-unit-to-pixel conversion */
#define wxDLG_UNIT(parent, pt) parent->ConvertDialogToPixels(pt)
/* Paper types */
-typedef enum {
+typedef enum
+{
wxPAPER_NONE, // Use specific dimensions
wxPAPER_LETTER, // Letter, 8 1/2 by 11 inches
wxPAPER_LEGAL, // Legal, 8 1/2 by 14 inches
wxPAPER_A3_TRANSVERSE, // A3 Transverse 297 x 420 mm
wxPAPER_A3_EXTRA_TRANSVERSE // A3 Extra Transverse 322 x 445 mm
-} wxPaperSize ;
+} wxPaperSize;
/* Printing orientation */
#ifndef wxPORTRAIT
/* Duplex printing modes
*/
-typedef enum {
+enum wxDuplexMode
+{
wxDUPLEX_SIMPLEX, // Non-duplex
wxDUPLEX_HORIZONTAL,
wxDUPLEX_VERTICAL
-} wxDuplexMode;
+};
/* Print quality.
*/
/* Print mode (currently PostScript only)
*/
-typedef enum {
+enum wxPrintMode
+{
wxPRINT_MODE_NONE = 0,
wxPRINT_MODE_PREVIEW = 1, // Preview in external application
wxPRINT_MODE_FILE = 2, // Print to file
wxPRINT_MODE_PRINTER = 3 // Send to printer
-} wxPrintMode;
+};
+
+// ----------------------------------------------------------------------------
+// UpdateWindowUI flags
+// ----------------------------------------------------------------------------
+
+enum wxUpdateUI
+{
+ wxUPDATE_UI_NONE = 0x0000,
+ wxUPDATE_UI_RECURSE = 0x0001,
+ wxUPDATE_UI_FROMIDLE = 0x0002 // Invoked from On(Internal)Idle
+};
// ----------------------------------------------------------------------------
// miscellaneous
// ----------------------------------------------------------------------------
// define this macro if font handling is done using the X font names
-#if defined(__WXGTK__) || defined(__X__)
+#if (defined(__WXGTK__) && !defined(__WXGTK20__)) || defined(__X__)
#define _WX_X_FONTLIKE
#endif
// macro to specify "All Files" on different platforms
#if defined(__WXMSW__) || defined(__WXPM__)
-# define wxALL_FILES_PATTERN "*.*"
+# define wxALL_FILES_PATTERN wxT("*.*")
# define wxALL_FILES gettext_noop("All files (*.*)|*.*")
#else
-# define wxALL_FILES_PATTERN "*"
+# define wxALL_FILES_PATTERN wxT("*")
# define wxALL_FILES gettext_noop("All files (*)|*")
#endif
typedef void* WXPOINTPTR ;
typedef void* WXHWND ;
typedef void* WXEVENTREF ;
+typedef void* WXEVENTHANDLERREF ;
+typedef void* WXEVENTHANDLERCALLREF ;
typedef void* WXAPPLEEVENTREF ;
typedef void* WXHDC ;
typedef void* WXHMENU ;
typedef void* WXWidget ;
typedef void* WXWindow ;
+typedef void* WXDisplay ;
/*
typedef WindowPtr WXHWND;
typedef Handle WXHANDLE;
*/
#endif
+#ifdef __WXCOCOA__
+
+// NOTE: This ought to work with other compilers too, but I'm being cautious
+#if defined(__GNUC__) && defined(__APPLE__)
+/* It's desirable to have type safety for Objective-C(++) code as it does
+at least catch typos of method names among other things. However, it
+is not possible to declare an Objective-C class from plain old C or C++
+code. Furthermore, because of C++ name mangling, the type name must
+be the same for both C++ and Objective-C++ code. Therefore, we define
+what should be a pointer to an Objective-C class as a pointer to a plain
+old C struct with the same name. Unfortunately, because the compiler
+does not see a struct as an Objective-C class we cannot declare it
+as a struct in Objective-C(++) mode.
+*/
+#if defined(__OBJC__)
+#define DECLARE_WXCOCOA_OBJC_CLASS(klass) \
+@class klass; \
+typedef klass *WX_##klass
+#else // not defined(__OBJC__)
+#define DECLARE_WXCOCOA_OBJC_CLASS(klass) \
+typedef struct klass *WX_##klass
+#endif // defined(__OBJC__)
+
+#else // not GNU
+#warning "Objective-C types will not be checked by the compiler."
+// NOTE: typedef struct objc_object *id;
+// IOW, we're declaring these using the id type without using that name,
+// since "id" is used extensively not only within wxWindows itself, but
+// also in wxWindows application code. The following works fine when
+// compiling C(++) code, and works without typesafety for Obj-C(++) code
+#define DECLARE_WXCOCOA_OBJC_CLASS(klass) \
+typedef struct objc_object *WX_##klass
+
+#endif // defined(__GNUC__) && defined(__APPLE__)
+
+DECLARE_WXCOCOA_OBJC_CLASS(NSApplication);
+DECLARE_WXCOCOA_OBJC_CLASS(NSBitmapImageRep);
+DECLARE_WXCOCOA_OBJC_CLASS(NSBox);
+DECLARE_WXCOCOA_OBJC_CLASS(NSButton);
+DECLARE_WXCOCOA_OBJC_CLASS(NSColor);
+DECLARE_WXCOCOA_OBJC_CLASS(NSControl);
+DECLARE_WXCOCOA_OBJC_CLASS(NSEvent);
+DECLARE_WXCOCOA_OBJC_CLASS(NSImage);
+DECLARE_WXCOCOA_OBJC_CLASS(NSLayoutManager);
+DECLARE_WXCOCOA_OBJC_CLASS(NSMenu);
+DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
+DECLARE_WXCOCOA_OBJC_CLASS(NSMutableArray);
+DECLARE_WXCOCOA_OBJC_CLASS(NSPanel);
+DECLARE_WXCOCOA_OBJC_CLASS(NSScrollView);
+DECLARE_WXCOCOA_OBJC_CLASS(NSTableColumn);
+DECLARE_WXCOCOA_OBJC_CLASS(NSTableView);
+DECLARE_WXCOCOA_OBJC_CLASS(NSTextContainer);
+DECLARE_WXCOCOA_OBJC_CLASS(NSTextField);
+DECLARE_WXCOCOA_OBJC_CLASS(NSTextStorage);
+DECLARE_WXCOCOA_OBJC_CLASS(NSThread);
+DECLARE_WXCOCOA_OBJC_CLASS(NSWindow);
+DECLARE_WXCOCOA_OBJC_CLASS(NSView);
+typedef WX_NSView WXWidget; // wxWindows BASE definition
+#endif // __WXCOCOA__
+
#if defined(__WXMSW__) || defined(__WXPM__)
// the keywords needed for WinMain() declaration
typedef unsigned int WXWPARAM;
typedef long WXLPARAM;
-#if !defined(__WIN32__) || defined(__GNUWIN32__) || defined(__WXWINE__) || defined(__WXMICROWIN__)
+#if !defined(__WIN32__) || defined(__GNUWIN32__) || defined(__WXMICROWIN__)
typedef int (*WXFARPROC)();
#else
typedef int (__stdcall *WXFARPROC)();
#endif // __WXMSW__
-#if defined(__WXPM__)
+#if defined(__WXPM__) || defined(__EMX__)
#ifdef __EMX__
/* Need a well-known type for WXFARPROC
below. MPARAM is typedef'ed too late. */
typedef unsigned long HGLOBAL;
typedef unsigned long DWORD;
typedef unsigned short WORD;
+#endif // WXPM || EMX
+#if defined (__WXPM__)
// WIN32 graphics types for OS/2 GPI
// RGB under OS2 is more like a PALETTEENTRY struct under Windows so we need a real RGB def
typedef void* WXFont;
typedef void* WXImage;
typedef void* WXFontList;
+typedef void* WXRendition;
+typedef void* WXRenderTable;
+typedef void* WXFontType; /* either a XmFontList or XmRenderTable */
+typedef void* WXString;
typedef unsigned long Atom; /* this might fail on a few architectures */
#endif
#ifdef __WXGTK20__
+/* Input method thing */
+typedef struct _GtkIMMulticontext GtkIMMulticontext;
+#endif // __WXGTK20__
+
+#endif // __WXGTK__
+
+#if defined(__WXGTK20__) || (defined(__WXX11__) && wxUSE_UNICODE)
+#define wxUSE_PANGO 1
+#else
+#define wxUSE_PANGO 0
+#endif
+
+#if wxUSE_PANGO
/* Stand-ins for Pango types */
typedef struct _PangoContext PangoContext;
typedef struct _PangoLayout PangoLayout;
typedef struct _PangoFontDescription PangoFontDescription;
-#endif // GTK+ 2.0
-
-#endif // GTK
+#endif
#ifdef __WXMGL__
typedef struct window_t *WXWidget;
classname(const classname&); \
classname& operator=(const classname&);
+#define DECLARE_NO_ASSIGN_CLASS(classname) \
+ private: \
+ classname& operator=(const classname&);
+
#endif
// _WX_DEFS_H_
projects / wxWidgets.git / blobdiff