#pragma interface "defs.h"
#endif
-#ifdef __WXGTK__
-
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-
-#endif
-
#include <stddef.h>
#include "wx/setup.h"
#endif
#endif
-// Eliminate double/float warnings
-#ifdef _MSC_VER
-# pragma warning(disable:4244)
+#if defined(sun) || defined(__SUN__)
+# if !defined(__GNUG__)
+# ifndef __SUNCC__
+# define __SUNCC__
+# endif
+# endif
#endif
+// suppress some Visual C++ warnings
+#ifdef _MSC_VER
+# pragma warning(disable:4244) // cobversion from double to float
+# pragma warning(disable:4100) // unreferenced formal parameter
+#endif
//////////////////////////////////////////////////////////////////////////////////
// Currently Only MS-Windows/NT, XView and Motif are supported
# define __X__
#endif
+#ifdef __WXMSW__
// wxWindows checks for WIN32, not __WIN32__
#if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))
#define __WIN32__
#define __WIN95__
#endif
+#endif // wxMSW
+
// Make sure the environment is set correctly
#if defined(__WXMSW__) && defined(__X__)
# error "Target can't be both X and Windows"
// VC++ 4.0 is 1000.
// Add more tests here for compilers that don't already define bool.
-#if ( defined(_MSC_VER) && (_MSC_VER <= 1000) ) || (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
-typedef unsigned int bool;
-#endif
-
-#if defined(_MSC_VER) && (_MSC_VER == 1020)
-#define bool unsigned int
+#if defined( __MWERKS__ )
+ #if (__MWERKS__ < 0x1000) || !__option(bool)
+ typedef unsigned int bool;
+ #endif
+#elif defined(_MSC_VER) && (_MSC_VER <= 1000)
+ typedef unsigned int bool;
+#elif defined(_MSC_VER) && (_MSC_VER == 1020)
+ #define bool unsigned int
+#elif defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
+ typedef unsigned int bool;
+#elif defined(__WATCOMC__)
+ typedef unsigned int bool;
+#elif defined(__SUNCC__)
+ // If we use int, we get identically overloaded functions in config.cpp
+ typedef unsigned char bool;
#endif
-#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__)
-#define byte unsigned char
+#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__))
+ #define byte unsigned char
#endif
typedef short int WXTYPE;
# ifdef WXMAKINGDLL
# define WXDLLEXPORT __declspec( dllexport )
# define WXDLLEXPORT_DATA(type) __declspec( dllexport ) type
-# define WXDLLEXPORT_CTORFN __declspec( dllexport )
+# define WXDLLEXPORT_CTORFN // __declspec( dllexport )
# elif defined(WXUSINGDLL)
# define WXDLLEXPORT __declspec( dllimport )
# define WXDLLEXPORT_DATA(type) __declspec( dllimport ) type
#undef except
#undef finally
#define except(x) catch(...)
+#elif defined(__MWERKS__)
+#undef try
+#undef except
+#undef finally
+#define except(x) catch(...)
#endif
// where should i put this? we need to make sure of this as it breaks
// the <iostream> code.
-#if !wxUSE_IOSTREAMH && WXDEBUG
-#undef WXDEBUG
+#if !wxUSE_IOSTREAMH && defined(__WXDEBUG__)
+#ifndef __MWERKS__
+#undef __WXDEBUG__
+#endif
#endif
// Callback function type definition
/*
* wxRadioBox/wxRadioButton style flags
*/
+
+// New, more intuitive names to specify majorDim argument
+
+// Same as wxRA_HORIZONTAL
+#define wxRA_SPECIFY_COLS 0x0001
+// Same as wxRA_VERTICAL
+#define wxRA_SPECIFY_ROWS 0x0002
+
+// Old names for compatibility
#define wxRA_HORIZONTAL wxHORIZONTAL
#define wxRA_VERTICAL wxVERTICAL
#define wxRB_GROUP 0x0004
#define wxSP_WRAP 0x0020
/*
- * wxSplitterWnd flags
+ * wxSplitterWindow flags
*/
#define wxSP_NOBORDER 0x0000
#define wxSP_3D 0x0004
#define wxSP_BORDER 0x0008
+/*
+ * wxFrame extra flags
+ */
+
+// No title on taskbar
+#define wxFRAME_TOOL_WINDOW 0x0004
+
/*
* wxTabCtrl flags
*/
// Logical ops
-typedef enum {
+typedef enum
+{
wxCLEAR, // 0
wxXOR, // src XOR dst
wxINVERT, // NOT dst
#define wxSIZE_NO_ADJUSTMENTS 0x0008
-// Data format for drag & drop and clipboard operations
-// numbers as per winuser.h
+/* Data format for drag & drop and clipboard operations
+ * numbers as per winuser.h */
enum wxDataFormat
{
wxDF_METAFILE = 3, /* CF_METAFILEPICT */
wxDF_DIB = 8, /* CF_DIB */
wxDF_OEMTEXT = 7, /* CF_OEMTEXT */
- wxDF_FILENAME = 15 /* CF_HDROP */
+ wxDF_FILENAME = 15, /* CF_HDROP */
+ wxDF_PRIVATE = 20
};
-// Virtual keycodes
+/* Virtual keycodes */
-enum wxKeyCode {
+enum wxKeyCode
+{
WXK_BACK = 8,
WXK_TAB = 9,
WXK_RETURN = 13,
WXK_MENU,
WXK_PAUSE,
WXK_CAPITAL,
- WXK_PRIOR, // Page up
- WXK_NEXT, // Page down
+ WXK_PRIOR, /* Page up */
+ WXK_NEXT, /* Page down */
WXK_END,
WXK_HOME,
WXK_LEFT,
WXK_PAGEDOWN
};
-// Colours - see wx_gdi.cc for database
-
-// OS mnemonics -- Identify the running OS (useful for Windows)
-// [Not all platforms are currently available or supported]
-enum {
+/* OS mnemonics -- Identify the running OS (useful for Windows)
+ * [Not all platforms are currently available or supported] */
+enum
+{
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
- wxNEXTSTEP, // NeXTStep
- wxMACINTOSH, // Apple System 7
- 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
+ wxCURSES, /* Text-only CURSES */
+ wxXVIEW_X, /* Sun's XView OpenLOOK toolkit */
+ wxMOTIF_X, /* OSF Motif 1.x.x */
+ wxCOSE_X, /* OSF Common Desktop Environment */
+ wxNEXTSTEP, /* NeXTStep */
+ wxMACINTOSH, /* Apple System 7 */
+ 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 */
};
-// Printing
+/* Printing */
#ifndef wxPORTRAIT
#define wxPORTRAIT 1
#define wxLANDSCAPE 2
#endif
-// Standard menu identifiers
+/* Standard menu identifiers */
#define wxID_OPEN 5000
#define wxID_CLOSE 5001
#define wxID_NEW 5002
#define wxID_HIGHEST 5999
-// Shortcut for easier dialog-unit-to-pixel conversion
+/* Shortcut for easier dialog-unit-to-pixel conversion */
#define wxDLG_UNIT(parent, pt) parent->ConvertDialogToPixels(pt)
#ifdef __WXMSW__
-// Stand-ins for Windows types, to avoid
-// #including all of windows.h
-
+/* Stand-ins for Windows types, to avoid
+ * #including all of windows.h */
typedef unsigned long WXHWND;
typedef unsigned long WXHANDLE;
typedef unsigned long WXHICON;
typedef void * WXLPCREATESTRUCT;
#ifdef __GNUWIN32__
typedef int (*WXFARPROC)();
-#else
+#elif defined(__WIN32__)
typedef int (__stdcall *WXFARPROC)();
+#else
+typedef int (*WXFARPROC)();
#endif
#endif
#ifdef __WXMOTIF__
-// Stand-ins for X/Xt/Motif types
+/* Stand-ins for X/Xt/Motif types */
typedef void* WXWindow;
typedef void* WXWidget;
typedef void* WXAppContext;
typedef void* WXFontList;
#endif
+#ifdef __WXGTK__
+/* Stand-ins for GLIB types */
+typedef int gint;
+typedef unsigned guint;
+typedef unsigned long gulong;
+typedef void* gpointer;
+
+/* Stand-ins for GDK types */
+typedef gulong GdkAtom;
+typedef struct _GdkColor GdkColor;
+typedef struct _GdkColormap GdkColormap;
+typedef struct _GdkFont GdkFont;
+typedef struct _GdkGC GdkGC;
+typedef struct _GdkWindow GdkWindow;
+typedef struct _GdkWindow GdkBitmap;
+typedef struct _GdkWindow GdkPixmap;
+typedef struct _GdkCursor GdkCursor;
+typedef struct _GdkRegion GdkRegion;
+
+/* Stand-ins for GTK types */
+typedef struct _GtkWidget GtkWidget;
+typedef struct _GtkStyle GtkStyle;
+typedef struct _GtkAdjustment GtkAdjustment;
+typedef struct _GtkList GtkList;
+typedef struct _GtkToolbar GtkToolbar;
+typedef struct _GtkNotebook GtkNotebook;
+typedef struct _GtkNotebookPage GtkNotebookPage;
+
+#endif
+
+
#endif
// _WX_DEFS_H_
projects / wxWidgets.git / blobdiff