added encoding conversion to wxHTML

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 2df82c842abf59c39db3881c711f041e5fbba436..d1717e5a402db2c8ffd9c9789cefba1eb4dc6b50 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -16,21 +16,16 @@
     #pragma interface "defs.h"
 #endif
 
     #pragma interface "defs.h"
 #endif
 

-
-// needed to handle strings with xgettext:
-#ifndef gettext_noop
-#  define gettext_noop(x) x
-#endif
-

 // ----------------------------------------------------------------------------
 // compiler and OS identification
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // compiler and OS identification
 // ----------------------------------------------------------------------------
 

-// OS
+// OS: first test for generic Unix defines, then for particular flavours and
+//     finally for Unix-like systems

 #if defined(__unix) || defined(__unix__) || defined(____SVR4____) || \
 #if defined(__unix) || defined(__unix__) || defined(____SVR4____) || \

-    defined(__LINUX__) || defined(__sgi ) || \
+    defined(__LINUX__) || defined(__sgi) || \

     defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
     defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \

-    defined(__EMX__) || defined( __VMS )
+    defined(__EMX__) || defined(__VMS) || defined(__BEOS__)

 
     #define __UNIX_LIKE__
 
 
     #define __UNIX_LIKE__
 


@@ -67,7 +62,10 @@
     #endif
 
     // Place other OS/2 compiler environment defines here
     #endif
 
     // Place other OS/2 compiler environment defines here

-    #define LINKAGEMODE _Optlink
+    #if defined(__VISAGECPP__)
+        // VisualAge is the only thing that understands _Optlink
+        #define LINKAGEMODE _Optlink
+    #endif

 #else   // Windows
     #ifndef __WINDOWS__
         #define __WINDOWS__
 #else   // Windows
     #ifndef __WINDOWS__
         #define __WINDOWS__


@@ -148,7 +146,7 @@
 // "old" GNUWIN32 is the one without Norlander's headers: it lacks the standard
 // Win32 headers and we define the used stuff ourselves for it in
 // wx/msw/gnuwin32/extra.h
 // "old" GNUWIN32 is the one without Norlander's headers: it lacks the standard
 // Win32 headers and we define the used stuff ourselves for it in
 // wx/msw/gnuwin32/extra.h

-#if defined(__MINGW32__) && !wxUSE_NORLANDER_HEADERS
+#if defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS

     #define __GNUWIN32_OLD__
 #endif
 
     #define __GNUWIN32_OLD__
 #endif
 


@@ -224,7 +222,7 @@
     #define __HPUX__
 #endif // HP-UX
 
     #define __HPUX__
 #endif // HP-UX
 

-// if we're on a Unixsystem but didn't use configure (so that setup.h didn't
+// if we're on a Unix system but didn't use configure (so that setup.h didn't

 // define __UNIX__), do define __UNIX__ now
 #if !defined(__UNIX__) && defined(__UNIX_LIKE__)
     #define __UNIX__
 // define __UNIX__), do define __UNIX__ now
 #if !defined(__UNIX__) && defined(__UNIX_LIKE__)
     #define __UNIX__


@@ -322,21 +320,37 @@ typedef int wxWindowID;
     #define WXUNUSED(identifier) identifier
 #endif
 
     #define WXUNUSED(identifier) identifier
 #endif
 

+// some arguments are only used in debug mode, but unused in release one
+#ifdef __WXDEBUG__
+    #define WXUNUSED_UNLESS_DEBUG(param)  param
+#else
+    #define WXUNUSED_UNLESS_DEBUG(param)  WXUNUSED(param)
+#endif
+

 // ----------------------------------------------------------------------------
 // portable calling conventions macros
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // portable calling conventions macros
 // ----------------------------------------------------------------------------
 

-// wxCALLBACK should be used for the functions which are called back by
-// Windows (such as compare function for wxListCtrl)
-#if defined(__WXMSW__)
-    #if defined(__MINGW32__) || defined(__GNUWIN32__)
-        #define wxCALLBACK __attribute__((stdcall))
+// stdcall is used for all functions called by Windows under Windows
+#ifdef __WINDOWS__
+    #if defined(__GNUWIN32__)
+        #define wxSTDCALL __attribute__((stdcall))

     #else
         // both VC++ and Borland understand this
     #else
         // both VC++ and Borland understand this

-        #define wxCALLBACK _stdcall
+        #define wxSTDCALL _stdcall

     #endif
     #endif

+
+#else // Win
+    // no such stupidness under Unix
+    #define wxSTDCALL
+#endif // platform
+
+// wxCALLBACK should be used for the functions which are called back by
+// Windows (such as compare function for wxListCtrl)
+#if defined(__WIN32__)
+    #define wxCALLBACK wxSTDCALL

 #else
 #else

-    // no stdcall under Unix
+    // no stdcall under Unix nor Win16

     #define wxCALLBACK
 #endif // platform
 
     #define wxCALLBACK
 #endif // platform
 


@@ -376,6 +390,22 @@ typedef int wxWindowID;
 #    define WXDLLEXPORT_CTORFN
 #  endif
 
 #    define WXDLLEXPORT_CTORFN
 #  endif
 

+#elif defined(__GNUC__)
+
+#  ifdef WXMAKINGDLL
+#    define WXDLLEXPORT __declspec( dllexport )
+#    define WXDLLEXPORT_DATA(type) __declspec( dllexport ) type
+#    define WXDLLEXPORT_CTORFN
+#  elif defined(WXUSINGDLL)
+#    define WXDLLEXPORT __declspec( dllimport )
+#    define WXDLLEXPORT_DATA(type) __declspec( dllimport ) type
+#    define WXDLLEXPORT_CTORFN
+#  else
+#    define WXDLLEXPORT
+#    define WXDLLEXPORT_DATA(type) type
+#    define WXDLLEXPORT_CTORFN
+#  endif
+

 #elif defined(__WXPM__)
 
 #  ifdef WXMAKINGDLL
 #elif defined(__WXPM__)
 
 #  ifdef WXMAKINGDLL


@@ -497,32 +527,32 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 // Not all platforms are currently available or supported
 enum
 {
 // 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 and 8
-  wxBEOS,                   // BeOS
-  wxGTK,                    // GTK on X
-  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
-  wxPENWINDOWS,             // Windows for Pen Computing
-  wxWINDOWS_NT,             // Windows NT
-  wxWIN32S,                 // Windows 32S API
-  wxWIN95,                  // Windows 95
-  wxWIN386,                 // Watcom 32-bit supervisor modus
-  wxMGL_UNIX,               // MGL with direct hardware access
-  wxMGL_X,                  // MGL on X
-  wxMGL_WIN32,              // MGL on Win32
-  wxMGL_OS2,                // MGL on OS/2
-  wxWINDOWS_OS2             // Native OS/2 PM
+    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 and 8
+    wxBEOS,                   // BeOS
+    wxGTK,                    // GTK on X
+    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
+    wxPENWINDOWS,             // Windows for Pen Computing
+    wxWINDOWS_NT,             // Windows NT
+    wxWIN32S,                 // Windows 32S API
+    wxWIN95,                  // Windows 95
+    wxWIN386,                 // Watcom 32-bit supervisor modus
+    wxMGL_UNIX,               // MGL with direct hardware access
+    wxMGL_X,                  // MGL on X
+    wxMGL_WIN32,              // MGL on Win32
+    wxMGL_OS2,                // MGL on OS/2
+    wxWINDOWS_OS2             // Native OS/2 PM

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -604,15 +634,15 @@ enum
 
 typedef float wxFloat32 ;
 #if defined( __WXMAC__ )  && defined (__MWERKS__)
 
 typedef float wxFloat32 ;
 #if defined( __WXMAC__ )  && defined (__MWERKS__)

-       typedef short double    wxFloat64;
+    typedef short double       wxFloat64;

 #else
 #else

-       typedef double                  wxFloat64;
+    typedef double                     wxFloat64;

 #endif
 
 #if defined( __WXMAC__ )  && !defined( __POWERPC__ )
 #endif
 
 #if defined( __WXMAC__ )  && !defined( __POWERPC__ )

-       typedef long double wxDouble;
+    typedef long double wxDouble;

 #else
 #else

-       typedef double wxDouble ;
+    typedef double wxDouble ;

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -890,13 +920,13 @@ enum wxStretch
 /*
  * wxToolBar style flags
  */
 /*
  * wxToolBar style flags
  */

-#define wxTB_3DBUTTONS          0x8000
-#define wxTB_HORIZONTAL         0x0002
-#define wxTB_VERTICAL           0x0004
+#define wxTB_HORIZONTAL         wxHORIZONTAL
+#define wxTB_VERTICAL           wxVERTICAL
+#define wxTB_3DBUTTONS          0x0010

 // Flatbar/Coolbar under Win98/ GTK 1.2
 // Flatbar/Coolbar under Win98/ GTK 1.2

-#define wxTB_FLAT               0x0008
+#define wxTB_FLAT               0x0020

 // use native docking under GTK
 // use native docking under GTK

-#define wxTB_DOCKABLE           0x0010
+#define wxTB_DOCKABLE           0x0040

 
 /*
  * wxMenuBar style flags
 
 /*
  * wxMenuBar style flags


@@ -1116,6 +1146,15 @@ enum wxStretch
 #define wxHW_SCROLLBAR_NEVER    0x0002
 #define wxHW_SCROLLBAR_AUTO     0x0004
 
 #define wxHW_SCROLLBAR_NEVER    0x0002
 #define wxHW_SCROLLBAR_AUTO     0x0004
 

+/*
+ * wxCalendarCtrl flags
+ */
+#define wxCAL_SUNDAY_FIRST      0x0000
+#define wxCAL_MONDAY_FIRST      0x0001
+#define wxCAL_SHOW_HOLIDAYS     0x0002
+#define wxCAL_NO_YEAR_CHANGE    0x0004
+#define wxCAL_NO_MONTH_CHANGE   0x000c // no month change => no year change
+

 /*
  * extended dialog specifiers. these values are stored in a different
  * flag and thus do not overlap with other style flags. note that these
 /*
  * extended dialog specifiers. these values are stored in a different
  * flag and thus do not overlap with other style flags. note that these


@@ -1153,6 +1192,14 @@ enum wxStretch
 // standard IDs
 // ----------------------------------------------------------------------------
 
 // standard IDs
 // ----------------------------------------------------------------------------
 

+// id for a separator line in the menu (invalid for normal item)
+#define wxID_SEPARATOR (-1)
+
+// this one is for compatibility only, don't use in new code
+#ifndef ID_SEPARATOR
+    #define ID_SEPARATOR    wxID_SEPARATOR
+#endif
+

 // Standard menu IDs
 #define wxID_LOWEST             4999
 
 // Standard menu IDs
 #define wxID_LOWEST             4999
 


@@ -1746,6 +1793,19 @@ typedef WXHWND WXWidget;
 #endif
 #endif
 
 #endif
 #endif
 

+// the keywords needed for WinMain() declaration
+#ifdef __WIN16__
+    #ifndef FAR
+        #ifdef __VISUALC__
+            #define FAR __far
+        #else // !VC++
+            #define FAR _far
+        #endif
+    #endif // no FAR
+#else // Win32
+    #define FAR
+#endif // Win16/32
+

 #endif // MSW
 
 #ifdef __WXMOTIF__
 #endif // MSW
 
 #ifdef __WXMOTIF__


@@ -1784,12 +1844,22 @@ typedef struct _GdkColor        GdkColor;
 typedef struct _GdkColormap     GdkColormap;
 typedef struct _GdkFont         GdkFont;
 typedef struct _GdkGC           GdkGC;
 typedef struct _GdkColormap     GdkColormap;
 typedef struct _GdkFont         GdkFont;
 typedef struct _GdkGC           GdkGC;

-typedef struct _GdkWindow       GdkWindow;
-typedef struct _GdkWindow       GdkBitmap;
-typedef struct _GdkWindow       GdkPixmap;
+#ifdef __WXGTK13__
+    typedef struct _GdkDrawable     GdkWindow;
+    typedef struct _GdkDrawable     GdkBitmap;
+    typedef struct _GdkDrawable     GdkPixmap;
+#else
+    typedef struct _GdkWindow       GdkWindow;
+    typedef struct _GdkWindow       GdkBitmap;
+    typedef struct _GdkWindow       GdkPixmap;
+#endif

 typedef struct _GdkCursor       GdkCursor;
 typedef struct _GdkRegion       GdkRegion;
 typedef struct _GdkDragContext  GdkDragContext;
 typedef struct _GdkCursor       GdkCursor;
 typedef struct _GdkRegion       GdkRegion;
 typedef struct _GdkDragContext  GdkDragContext;

+#ifdef HAVE_XIM
+typedef struct _GdkIC           GdkIC;
+typedef struct _GdkICAttr       GdkICAttr;
+#endif

 
 /* Stand-ins for GTK types */
 typedef struct _GtkWidget         GtkWidget;
 
 /* Stand-ins for GTK types */
 typedef struct _GtkWidget         GtkWidget;