X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..72cb6ff3b3f6aa8f9ed8a3bf10e334f8eb50be99:/include/wx/defs.h?ds=sidebyside diff --git a/include/wx/defs.h b/include/wx/defs.h index 20ef449029..456eb162ed 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -9,14 +9,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __DEFSH__ -#define __DEFSH__ +#ifndef _WX_DEFS_H_ +#define _WX_DEFS_H_ #ifdef __GNUG__ #pragma interface "defs.h" #endif -#ifdef __GTK__ +#ifdef __WXGTK__ #include "glib.h" #include "gdk/gdk.h" @@ -43,19 +43,15 @@ ////////////////////////////////////////////////////////////////////////////////// // Currently Only MS-Windows/NT, XView and Motif are supported // -#if defined(__HPUX__) && !defined(__MOTIF__) -# define __MOTIF__ +#if defined(__HPUX__) && !defined(__WXMOTIF__) +# define __WXMOTIF__ #endif -#if defined(__MOTIF__) +#if defined(__WXMOTIF__) # define __X__ -#elif defined(__WINDOWS__) || defined(__WINDOWS_386__) || defined(__NT__) || defined(__MSDOS__) -# ifndef __WINDOWS__ -# define __WINDOWS__ -# endif #endif // wxWindows checks for WIN32, not __WIN32__ -#if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__)) +#if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__)) #define __WIN32__ #endif @@ -68,13 +64,14 @@ #endif // Make sure the environment is set correctly -#if defined(__WINDOWS__) && defined(__X__) +#if defined(__WXMSW__) && defined(__X__) # error "Target can't be both X and Windows" -#elif !defined(__MOTIF__) && !defined(__WINDOWS__) && !defined(__GTK__) && !defined(__MAC__) && !defined(__X__) -#error "No Target! Use -D[__MOTIF__|__GTK__|__WINDOWS__|__MAC__]" +#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \ + !defined(__WXMAC__) && !defined(__X__) && !defined(__WXQT__) && !defined(__WXSTUBS__) +#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXSTUBS__]" #endif -#if defined(__MOTIF__) || defined(__GTK__) +#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXSTUBS__) // Bool is now obsolete, use bool instead // typedef int Bool; @@ -85,7 +82,7 @@ # define Bool_DEFINED #endif -#elif defined(__WINDOWS__) +#elif defined(__WXMSW__) #ifndef TRUE # define TRUE 1 @@ -119,7 +116,7 @@ typedef int wxWindowID; * Making or using wxWindows as a Windows DLL */ -#ifdef __WINDOWS__ +#ifdef __WXMSW__ #ifdef __BORLANDC__ @@ -210,10 +207,15 @@ enum ErrCode /** @name Very common macros */ // ---------------------------------------------------------------------------- //@{ -/// delete pointer if it is not NULL -#define DELETEP(p) if ( (p) != NULL ) delete (p) -/// delete array pointer if it is not NULL -#define DELETEA(p) if ( (p) != NULL ) delete [] (p) +/// delete pointer if it is not NULL and NULL it afterwards +// (checking that it's !NULL before passing it to delete is just a +// a question of style, because delete will do it itself anyhow, but it might +// be considered as an error by some overzealous debugging implementations of +// the library, so we do it ourselves) +#define wxDELETE(p) if ( (p) != NULL ) { delete (p); p = NULL; } + +// delete an array and NULL it (see comments above) +#define wxDELETEA(p) if ( (p) != NULL ) { delete [] (p); p = NULL; } /// size of statically declared array #define WXSIZEOF(array) (sizeof(array)/sizeof(array[0])) @@ -230,10 +232,6 @@ enum ErrCode #endif #ifndef __UNIX__ // Windows - #ifndef __WINDOWS__ - #define __WINDOWS__ - #endif - #if defined(_MSC_VER) #define __VISUALC__ #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__) @@ -248,10 +246,10 @@ enum ErrCode #if defined(__UNIX__) #define FILE_PATH_SEPARATOR ('/') -#elif defined(__WINDOWS__) +#elif defined(__WXMSW__) #define FILE_PATH_SEPARATOR ('\\') #else - #error "don't know path separator for this platform" + #define FILE_PATH_SEPARATOR ('/') #endif // ---------------------------------------------------------------------------- @@ -309,11 +307,14 @@ typedef void (*wxFunction) (wxObject&, wxEvent&); #define wxUSER_COLOURS 0x00800000 // Override CTL3D etc. control colour processing to // allow own background colour - // OBSOLETE - use wxNO_CTL3D instead + // OBSOLETE - use wxNO_3D instead #define wxNO_3D 0x00800000 // Override CTL3D or native 3D styles for children -#define wxOVERRIDE_KEY_TRANSLATIONS 0x00400000 - // TODO: do we need this??? (Motif only) +#define wxCLIP_CHILDREN 0x00400000 + // Clip children when painting, which reduces flicker in + // e.g. frames and splitter windows, but can't be used in + // a panel where a static box must be 'transparent' (panel + // paints the background for it) // Add this style to a panel to get tab traversal working // outside of dialogs. @@ -343,7 +344,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&); #define wxDIALOG_MODAL 0x0020 #define wxDIALOG_MODELESS 0x0000 -#define wxDEFAULT_FRAME_STYLE (wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION) +#define wxDEFAULT_FRAME_STYLE (wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN) #if WXWIN_COMPATIBILITY #define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE @@ -364,6 +365,10 @@ typedef void (*wxFunction) (wxObject&, wxEvent&); */ #define wxTB_3DBUTTONS 0x8000 +#define wxTB_HORIZONTAL 0x0002 +#define wxTB_VERTICAL 0x0004 +// Flatbar/Coolbar under Win98 +#define wxTB_FLAT 0x0008 /* * Apply to all panel items @@ -382,21 +387,14 @@ typedef void (*wxFunction) (wxObject&, wxEvent&); * Styles for wxListBox */ -// In wxListBox style flag -#define wxSB_MASK 0x0008 -#define wxNEEDED_SB 0x0000 -#define wxALWAYS_SB 0x0008 - -// New naming convention -#define wxLB_NEEDED_SB wxNEEDED_SB -#define wxLB_ALWAYS_SB wxALWAYS_SB #define wxLB_SORT 0x0010 -// These duplicate the styles in the Multiple argument -#define wxLB_SINGLE 0x0000 +#define wxLB_SINGLE 0x0020 #define wxLB_MULTIPLE 0x0040 #define wxLB_EXTENDED 0x0080 // wxLB_OWNERDRAW is Windows-only #define wxLB_OWNERDRAW 0x0100 +#define wxLB_NEEDED_SB 0x0200 +#define wxLB_ALWAYS_SB 0x0400 #define wxLB_HSCROLL wxHSCROLL /* @@ -409,19 +407,16 @@ typedef void (*wxFunction) (wxObject&, wxEvent&); #define wxTE_READONLY 0x0010 #define wxTE_MULTILINE 0x0020 -// TODO For backward compatibility, need wxOLD_READONLY -#define wxREADONLY wxTE_READONLY -#define wxEDITABLE 0 - -// #define wxTE_RICHTEXT 0x0020 +// MSW-only +#define wxTE_RICHTEXT 0x0020 /* * wxComboBox style flags */ #define wxCB_SIMPLE 0x0004 -#define wxCB_DROPDOWN 0x0000 #define wxCB_SORT 0x0008 -#define wxCB_READONLY wxREADONLY +#define wxCB_READONLY 0x0010 +#define wxCB_DROPDOWN 0x0020 /* * wxRadioBox/wxRadioButton style flags @@ -475,6 +470,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&); #define wxTR_HAS_BUTTONS 0x0004 #define wxTR_EDIT_LABELS 0x0008 +#define wxTR_LINES_AT_ROOT 0x0010 /* * wxListCtrl flags @@ -531,11 +527,17 @@ typedef void (*wxFunction) (wxObject&, wxEvent&); #define wxTAB_FIXEDWIDTH 0x0008 #define wxTAB_OWNERDRAW 0x0010 +// Sorry, I changed my mind about these names... +#define wxTC_MULTILINE 0x0000 +#define wxTC_RIGHTJUSTIFY 0x0004 +#define wxTC_FIXEDWIDTH 0x0008 +#define wxTC_OWNERDRAW 0x0010 + /* * wxStatusBar95 flags */ -#define wxSB_SIZEGRIP 0x0002 +#define wxST_SIZEGRIP 0x0002 /* * GDI descriptions @@ -653,26 +655,35 @@ typedef enum { // Possible SetSize flags // Use internally-calculated width if -1 -#define wxSIZE_AUTO_WIDTH 1 +#define wxSIZE_AUTO_WIDTH 0x0001 // Use internally-calculated height if -1 -#define wxSIZE_AUTO_HEIGHT 2 +#define wxSIZE_AUTO_HEIGHT 0x0002 // Use internally-calculated width and height if each is -1 -#define wxSIZE_AUTO 3 +#define wxSIZE_AUTO (wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT) // Ignore missing (-1) dimensions (use existing). // For readability only: test for wxSIZE_AUTO_WIDTH/HEIGHT in code. -#define wxSIZE_USE_EXISTING 0 +#define wxSIZE_USE_EXISTING 0x0000 // Allow -1 as a valid position -#define wxSIZE_ALLOW_MINUS_ONE 4 +#define wxSIZE_ALLOW_MINUS_ONE 0x0004 +// Don't do parent client adjustments (for implementation only) +#define wxSIZE_NO_ADJUSTMENTS 0x0008 -// Clipboard formats -// Numbers as per winuser.h -# define wxCF_TEXT 1 /* CF_TEXT */ -# define wxCF_BITMAP 2 /* CF_BITMAP */ -# define wxCF_METAFILE 3 /* CF_METAFILEPICT */ -# define wxCF_DIB 8 /* CF_DIB */ -# define wxCF_OEMTEXT 7 /* CF_OEMTEXT */ + +// Data format for drag & drop and clipboard operations +// numbers as per winuser.h + +enum wxDataFormat +{ + wxDF_TEXT = 1, /* CF_TEXT */ + wxDF_BITMAP = 2, /* CF_BITMAP */ + wxDF_METAFILE = 3, /* CF_METAFILEPICT */ + wxDF_DIB = 8, /* CF_DIB */ + wxDF_OEMTEXT = 7, /* CF_OEMTEXT */ + wxDF_FILENAME = 15 /* CF_HDROP */ +}; // Virtual keycodes + enum _Virtual_keycodes { WXK_BACK = 8, WXK_TAB = 9, @@ -757,20 +768,23 @@ enum _Virtual_keycodes { // OS mnemonics -- Identify the running OS (useful for Windows) // [Not all platforms are currently available or supported] enum { - wxCURSES, + wxUNKNOWN_PLATFORM, + wxCURSES, // Text-only CURSES wxXVIEW_X, // Sun's XView OpenLOOK toolkit wxMOTIF_X, // OSF Motif 1.x.x - wxCOSE_X, // OSF Common Desktop Environment + wxCOSE_X, // OSF Common Desktop Environment wxNEXTSTEP, // NeXTStep wxMACINTOSH, // Apple System 7 - wxGEOS, // GEOS - wxOS2_PM, // OS/2 Workplace + wxGTK, // GTK + wxQT, // Qt + wxGEOS, // GEOS + wxOS2_PM, // OS/2 Workplace wxWINDOWS, // Windows or WfW wxPENWINDOWS, // Windows for Pen Computing wxWINDOWS_NT, // Windows NT - wxWIN32S, // Windows 32S API - wxWIN95, // Windows 95 - wxWIN386 // Watcom 32-bit supervisor modus + wxWIN32S, // Windows 32S API + wxWIN95, // Windows 95 + wxWIN386 // Watcom 32-bit supervisor modus }; // Printing @@ -820,8 +834,9 @@ enum { #define wxID_APPLY 5102 #define wxID_YES 5103 #define wxID_NO 5104 +#define wxID_STATIC 5105 -#ifdef __WINDOWS__ +#ifdef __WXMSW__ // Stand-ins for Windows types, to avoid // #including all of windows.h @@ -835,6 +850,7 @@ typedef unsigned long WXHBRUSH; typedef unsigned long WXHPALETTE; typedef unsigned long WXHCURSOR; typedef unsigned long WXHRGN; +typedef unsigned long WXHACCEL; typedef unsigned long WXHINSTANCE; typedef unsigned long WXHBITMAP; typedef unsigned long WXHIMAGELIST; @@ -846,16 +862,19 @@ typedef unsigned short WXWORD; typedef unsigned int WXWPARAM; typedef long WXLPARAM; typedef unsigned long WXCOLORREF; -typedef void * WXRGN; typedef void * WXRGNDATA; typedef void * WXMSG; typedef unsigned long WXHCONV; typedef void * WXDRAWITEMSTRUCT; typedef void * WXMEASUREITEMSTRUCT; typedef void * WXLPCREATESTRUCT; +#ifdef __GNUWIN32__ typedef int (*WXFARPROC)(); +#else +typedef int (__stdcall *WXFARPROC)(); +#endif #endif #endif - // __WXDEFSH__ + // _WX_DEFS_H_