#error "Target can't be both X and Windows"
#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
!defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \
- !defined(__WXMGL__) && wxUSE_GUI
+ !defined(__WXMGL__) && !defined(__WXX11__) && wxUSE_GUI
#ifdef __UNIX__
#error "No Target! You should use wx-config program for compilation flags!"
#else // !Unix
#if (__MWERKS__ >= 0x1000) && __option(bool)
#define HAVE_BOOL
#endif
+ #elif defined(__APPLE__) && defined(__APPLE_CC__)
+ // Apple bundled gcc supports bool
+ #define HAVE_BOOL
#elif defined(__VISUALC__) && (__VISUALC__ == 1020)
// in VC++ 4.2 the bool keyword is reserved (hence can't be typedefed)
// but not implemented, so we must #define it
// ----------------------------------------------------------------------------
// 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
#define wxCALLBACK
#endif // platform
-// callling convention for the qsort(3) callback
+// generic calling convention for the extern "C" functions
#if defined(__VISUALC__)
- #define wxCMPFUNC_CONV _cdecl
+ #define wxC_CALLING_CONV _cdecl
#elif defined(__VISAGECPP__)
- #define wxCMPFUNC_CONV _Optlink
+ #define wxC_CALLING_CONV _Optlink
#else // !Visual C++
- #define wxCMPFUNC_CONV
+ #define wxC_CALLING_CONV
#endif // compiler
+// callling convention for the qsort(3) callback
+#define wxCMPFUNC_CONV wxC_CALLING_CONV
+
// compatibility :-(
#define CMPFUNC_CONV wxCMPFUNC_CONV
#define WXEXPORT _Export
#define WXIMPORT _Export
#endif
+#elif defined(__WXMAC__)
+ #ifdef __MWERKS__
+ #define WXEXPORT __declspec(export)
+ #define WXIMPORT __declspec(import)
+ #endif
#endif
// for other platforms/compilers we don't anything
wxGEOS, // GEOS
wxOS2_PM, // OS/2 Workplace
wxWINDOWS, // Windows or WfW
+ wxMICROWINDOWS, // MicroWindows
wxPENWINDOWS, // Windows for Pen Computing
wxWINDOWS_NT, // Windows NT
wxWIN32S, // Windows 32S API
wxMGL_OS2, // MGL on OS/2
wxMGL_DOS, // MGL on MS-DOS
wxWINDOWS_OS2, // Native OS/2 PM
- wxUNIX // wxBase under Unix
+ wxUNIX, // wxBase under Unix
+ wxX11 // Plain X11 and Universal widgets
};
// ----------------------------------------------------------------------------
// parent is destroyed before the child
#define wxWS_EX_TRANSIENT 0x00000004
+// 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 wxDIALOG_EX_CONTEXTHELP 0x00000004
+
/*
* wxFrame/wxDialog style flags
*/
#define wxICONIZE 0x4000
#define wxMINIMIZE wxICONIZE
#define wxMAXIMIZE 0x2000
-// free value: 0x1000
+ // free flag value: 0x1000
#define wxSYSTEM_MENU 0x0800
#define wxMINIMIZE_BOX 0x0400
#define wxMAXIMIZE_BOX 0x0200
// 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
+#define wxDIALOG_MODAL 0x0020 // free flag value 0x0020
#define wxDIALOG_MODELESS 0x0000
-// deprecated flag, don't use any more, defined for compatibility only
-#define wxFRAME_FLOAT_ON_PARENT 0
-
-// Context-sensitive help
-#define wxFRAME_EX_CONTEXTHELP 0x00000004
-#define wxDIALOG_EX_CONTEXTHELP 0x00000004
-
/*
* MDI parent frame style flags
* Can overlap with some of the above.
wxMINIMIZE_BOX | wxMAXIMIZE_BOX | \
wxCAPTION | wxCLIP_CHILDREN)
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXPM__)
# define wxDEFAULT_DIALOG_STYLE (wxSYSTEM_MENU | wxCAPTION)
#else
// Under Unix, the dialogs don't have a system menu. Specifying wxSYSTEM_MENU
// be modal. No progress will then be made at all.
#define wxPD_REMAINING_TIME 0x0040
-/*
- * wxHtmlWindow flags
- */
-#define wxHW_SCROLLBAR_NEVER 0x0002
-#define wxHW_SCROLLBAR_AUTO 0x0004
-
/*
* extended dialog specifiers. these values are stored in a different
* flag and thus do not overlap with other style flags. note that these
#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
#endif
// macro to specify "All Files" on different platforms
-#if defined(__WXMSW__)
+#if defined(__WXMSW__) || defined(__WXPM__)
# define wxALL_FILES_PATTERN "*.*"
# define wxALL_FILES gettext_noop("All files (*.*)|*.*")
#else
#ifdef __WXMAC__
+typedef unsigned char WXCOLORREF[6];
+typedef void* WXHBITMAP;
+typedef void* WXHMETAFILE ;
+typedef void* WXHICON ;
+typedef void* WXHCURSOR ;
+typedef void* WXHRGN ;
+typedef void* WXRECTPTR ;
+typedef void* WXPOINTPTR ;
+typedef void* WXHWND ;
+typedef void* WXEVENTREF ;
+typedef void* WXAPPLEEVENTREF ;
+typedef void* WXHDC ;
+typedef void* WXHMENU ;
+typedef unsigned int WXUINT;
+typedef unsigned long WXDWORD;
+typedef unsigned short WXWORD;
+
+typedef void* WXWidget ;
+typedef void* WXWindow ;
+/*
typedef WindowPtr WXHWND;
typedef Handle WXHANDLE;
typedef CIconHandle WXHICON;
typedef RgnHandle WXHRGN;
//typedef unsigned long WXHACCEL;
//typedef unsigned long WXHINSTANCE;
-typedef GWorldPtr WXHBITMAP;
//typedef unsigned long WXHIMAGELIST;
//typedef unsigned long WXHGLOBAL;
typedef GrafPtr WXHDC;
-typedef unsigned int WXUINT;
-typedef unsigned long WXDWORD;
-typedef unsigned short WXWORD;
//typedef unsigned int WXWPARAM;
//typedef long WXLPARAM;
-typedef RGBColor WXCOLORREF;
//typedef void * WXRGNDATA;
//typedef void * WXMSG;
//typedef unsigned long WXHCONV;
typedef WindowPtr WXWindow;
typedef ControlHandle WXWidget;
-
+*/
#endif
#if defined(__WXMSW__) || defined(__WXPM__)
#if defined(__WXPM__)
+#ifdef __EMX__
+/* Need a well-known type for WXFARPROC
+ below. MPARAM is typedef'ed too late. */
+#define WXWPARAM void *
+#define WXLPARAM void *
+#else
#define WXWPARAM MPARAM
#define WXLPARAM MPARAM
+#endif
#define RECT RECTL
#define LOGFONT FATTRS
#define LOWORD SHORT1FROMMP
// VA 3.0 for some reason needs base data types when typedefing a proc proto???
typedef void* (_System *WXFARPROC)(unsigned long, unsigned long, void*, void*);
#else
+#ifdef __EMX__
+#define _System
+#endif
typedef WXRESULT (_System *WXFARPROC)(WXHWND, WXMSGID, WXWPARAM, WXLPARAM);
#endif
#endif //__WXPM__
-#ifdef __WXMOTIF__
+#if defined(__WXMOTIF__) || defined(__WXX11__)
/* Stand-ins for X/Xt/Motif types */
typedef void* WXWindow;
typedef void* WXWidget;
typedef void* WXAppContext;
typedef void* WXColormap;
+typedef void* WXColor;
typedef void WXDisplay;
typedef void WXEvent;
typedef void* WXCursor;
typedef struct _GdkColormap GdkColormap;
typedef struct _GdkFont GdkFont;
typedef struct _GdkGC GdkGC;
+typedef struct _GdkVisual GdkVisual;
#ifdef __WXGTK20__
typedef struct _GdkDrawable GdkWindow;
typedef struct _GdkDrawable GdkBitmap;
projects / wxWidgets.git / blobdiff