X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98ec9dbebc5584ba1b903d314b25e8c562891483..0e0de6b8aa49309ba439fcfd7251967915749c09:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index ae282dcf5e..a83a5b9b81 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -37,6 +37,12 @@ #endif #endif // Win32 +#if defined(__WXMSW__) || defined(__WIN32__) + #if !defined(__WINDOWS__) + #define __WINDOWS__ + #endif +#endif + #ifdef __WXWINE__ #ifndef __WIN32__ #define __WIN32__ @@ -112,41 +118,26 @@ #define __HPUX__ #endif // HP-UX - #if defined(__APPLE__) - // MacOS X - #ifndef __WXMAC__ - #define __WXMAC__ - #endif - #ifndef __WXMAC_X__ - // This define really should not be necessary since __WXMAC__ - // combined with __UNIX__ is sufficient to differentiate - // Classic Mac OS from Mac OS X. However, some code has been - // added to workaround defects(?) in the bundled gcc compiler - // and these corrections are identified by __WXMAC_X__ - #define __WXMAC_X__ - #endif + #if defined(__WXMAC__) && defined(__DARWIN__) + // Mac OS X + + // Some code has been added to workaround defects(?) in the + // bundled gcc compiler. These corrections are identified by: + // __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif) #include - #endif // __APPLE__ + #endif // __WXMAC__ && __DARWIN__ #elif defined(applec) || \ defined(THINK_C) || \ (defined(__MWERKS__) && !defined(__INTEL__)) // MacOS -#elif defined(__WXMAC__) && defined(__APPLE__) - // MacOS X +#elif defined(__WXMAC__) && defined(__DARWIN__) + // Mac OS X #define __UNIX_LIKE__ - #ifndef __WXMAC__ - #define __WXMAC__ - #endif - #ifndef __WXMAC_X__ - // This define really should not be necessary since __WXMAC__ - // combined with __UNIX__ is sufficient to differentiate - // Classic Mac OS from Mac OS X. However, some code has been - // added to workaround defects(?) in the bundled gcc compiler - // and these corrections are identified by __WXMAC_X__ - #define __WXMAC_X__ - #endif + // Some code has been added to workaround defects(?) in the + // bundled gcc compiler. These corrections are identified by: + // __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif) #include #elif defined(__OS2__) @@ -282,7 +273,7 @@ #error "Target can't be both X and Windows" #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \ !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \ - !defined(__WXQT__) && !defined(__WXMGL__) && wxUSE_GUI + !defined(__WXMGL__) && wxUSE_GUI #ifdef __UNIX__ #error "No Target! You should use wx-config program for compilation flags!" #else // !Unix @@ -612,7 +603,6 @@ enum wxGTK_WIN32, // GTK on Win32 wxGTK_OS2, // GTK on OS/2 wxGTK_BEOS, // GTK on BeOS - wxQT, // Qt wxGEOS, // GEOS wxOS2_PM, // OS/2 Workplace wxWINDOWS, // Windows or WfW @@ -1107,22 +1097,6 @@ enum wxBorder #define wxLB_HSCROLL wxHSCROLL // always show an entire number of rows #define wxLB_INT_HEIGHT 0x0800 -/* - * wxTextCtrl style flags - */ -// the flag bits 0x0001, 2, 4 and 8 are free but should be used only for the -// things which don't make sense for a text control used by wxTextEntryDialog -// because they would otherwise conflict with wxOK, wxCANCEL, wxCENTRE -#define wxTE_READONLY 0x0010 -#define wxTE_MULTILINE 0x0020 -#define wxTE_PROCESS_TAB 0x0040 -// this style means to use RICHEDIT control and does something only under wxMSW -// and Win32 and is silently ignored under all other platforms -#define wxTE_RICH 0x0080 -#define wxTE_NO_VSCROLL 0x0100 -#define wxTE_AUTO_SCROLL 0x0200 -#define wxTE_PROCESS_ENTER 0x0400 -#define wxTE_PASSWORD 0x0800 // use wxHSCROLL to not wrap text at all, wxTE_LINEWRAP to wrap it at any // position and wxTE_WORDWRAP to wrap at words boundary @@ -1195,31 +1169,6 @@ enum wxBorder #define wxSB_HORIZONTAL wxHORIZONTAL #define wxSB_VERTICAL wxVERTICAL -/* - * wxButton flags (Win32 only) - */ -#define wxBU_AUTODRAW 0x0004 -#define wxBU_NOAUTODRAW 0x0000 -#define wxBU_LEFT 0x0040 -#define wxBU_TOP 0x0080 -#define wxBU_RIGHT 0x0100 -#define wxBU_BOTTOM 0x0200 - -/* - * wxTreeCtrl flags - */ -#define wxTR_HAS_BUTTONS 0x0004 -#define wxTR_EDIT_LABELS 0x0008 -#define wxTR_LINES_AT_ROOT 0x0010 - -#define wxTR_SINGLE 0x0000 -#define wxTR_MULTIPLE 0x0020 -#define wxTR_EXTENDED 0x0040 -#define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080 -#define wxTR_NO_LINES 0x0100 -#define wxTR_MAC_BUTTONS 0x0200 -#define wxTR_ROW_LINES 0x0400 - /* * wxSpinButton flags. * Note that a wxSpinCtrl is sometimes defined as @@ -1244,14 +1193,6 @@ enum wxBorder #define wxSP_FULLSASH 0x0400 #define wxSP_3D (wxSP_3DBORDER | wxSP_3DSASH) -/* - * wxTabCtrl flags - */ -#define wxTC_MULTILINE 0x0000 -#define wxTC_RIGHTJUSTIFY 0x0010 -#define wxTC_FIXEDWIDTH 0x0020 -#define wxTC_OWNERDRAW 0x0040 - /* * wxNotebook flags */ @@ -1262,6 +1203,14 @@ enum wxBorder #define wxNB_BOTTOM 0x0080 #define wxNB_MULTILINE 0x0100 +/* + * wxTabCtrl flags + */ +#define wxTC_RIGHTJUSTIFY 0x0010 +#define wxTC_FIXEDWIDTH 0x0020 +#define wxTC_OWNERDRAW 0x0040 +#define wxTC_MULTILINE wxNB_MULTILINE + /* * wxStatusBar95 flags */ @@ -2026,7 +1975,6 @@ typedef void* WXGC; typedef void* WXRegion; typedef void* WXFont; typedef void* WXImage; -typedef void* WXCursor; typedef void* WXFontList; typedef unsigned long Atom; /* this might fail on a few architectures */ @@ -2095,7 +2043,7 @@ typedef struct _PangoFontDescription PangoFontDescription; #endif // GTK #ifdef __WXMGL__ -typedef void *WXWidget; // FIXME_MGL - type-safe +typedef struct window_t *WXWidget; #endif // MGL // This is required because of clashing macros in windows.h, which may be