*** empty log message ***

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index bfa0d45da7a8b63092f77a360c733df3d7f90fb3..cb603db5e9977f74f477e85aa5f6f21fe972c8a1 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -68,6 +68,17 @@
 
 #elif defined(applec) || defined(THINK_C) || ( defined( __MWERKS__ ) && !defined(__INTEL__) )
         // MacOS
 
 #elif defined(applec) || defined(THINK_C) || ( defined( __MWERKS__ ) && !defined(__INTEL__) )
         // MacOS

+#elif defined(__OS2__)
+    #if defined(__IBMCPP__)
+        #define __VISAGEAVER__ __IBMCPP__
+    #endif
+    #ifndef __WXOS2__
+        #define __WXOS2__
+    #endif
+    #ifndef __WXPM__
+        #define __WXPM__
+    #endif
+    // Place other OS/2 compiler environment defines here

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


@@ -175,9 +186,9 @@
 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)
     #error "Target can't be both X and Windows"
 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)
     #error "Target can't be both X and Windows"

-#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
+#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXPM__) && \

       !defined(__WXMAC__) && !defined(__X__) && !defined(__WXQT__) && !defined(__WXSTUBS__)
       !defined(__WXMAC__) && !defined(__X__) && !defined(__WXQT__) && !defined(__WXSTUBS__)

-    #error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXSTUBS__]"
+    #error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXPM__|__WXSTUBS__]"

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -188,7 +199,7 @@
 // check for native bool type and TRUE/FALSE constants
 // ----------------------------------------------------------------------------
 
 // check for native bool type and TRUE/FALSE constants
 // ----------------------------------------------------------------------------
 

-#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXSTUBS__)
+#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXPM__) || defined(__WXSTUBS__)

     // Bool is now obsolete, use bool instead
     // typedef int Bool;
 
     // Bool is now obsolete, use bool instead
     // typedef int Bool;
 


@@ -233,6 +244,9 @@
     #elif defined(__GNUWIN32__)
         // Cygwin supports bool
         #define HAVE_BOOL
     #elif defined(__GNUWIN32__)
         // Cygwin supports bool
         #define HAVE_BOOL

+    #elif defined(__VISAGECPP__)
+        typedef unsigned long bool;
+        #define HAVE_BOOL

     #endif // compilers
 #endif // HAVE_BOOL
 
     #endif // compilers
 #endif // HAVE_BOOL
 


@@ -263,7 +277,7 @@ typedef int wxWindowID;
  * Making or using wxWindows as a Windows DLL
  */
 
  * Making or using wxWindows as a Windows DLL
  */
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__)

 
 // _declspec works in BC++ 5 and later, as well as VC++
 #if defined(__VISUALC__) || defined(__BORLANDC__)
 
 // _declspec works in BC++ 5 and later, as well as VC++
 #if defined(__VISUALC__) || defined(__BORLANDC__)


@@ -282,6 +296,22 @@ typedef int wxWindowID;
 #    define WXDLLEXPORT_CTORFN
 #  endif
 
 #    define WXDLLEXPORT_CTORFN
 #  endif
 

+#elif defined(__WXPM__)
+
+#  ifdef WXMAKINGDLL
+#    define WXDLLEXPORT _Export
+#    define WXDLLEXPORT_DATA(type) _Export type
+#    define WXDLLEXPORT_CTORFN
+#  elif defined(WXUSINGDLL)
+#    define WXDLLEXPORT _Export
+#    define WXDLLEXPORT_DATA(type) _Export type
+#    define WXDLLEXPORT_CTORFN
+#  else
+#    define WXDLLEXPORT
+#    define WXDLLEXPORT_DATA(type) type
+#    define WXDLLEXPORT_CTORFN
+#  endif
+

 #else
 #  define WXDLLEXPORT
 #  define WXDLLEXPORT_DATA(type) type
 #else
 #  define WXDLLEXPORT
 #  define WXDLLEXPORT_DATA(type) type


@@ -408,7 +438,7 @@ enum
   wxWIN95,                  // Windows 95
   wxWIN386,                 // Watcom 32-bit supervisor modus
   wxMGL_UNIX,               // MGL with direct hardware access
   wxWIN95,                  // Windows 95
   wxWIN386,                 // Watcom 32-bit supervisor modus
   wxMGL_UNIX,               // MGL with direct hardware access

-  wxMGL_X,                  // MGL on X 
+  wxMGL_X,                  // MGL on X

   wxMGL_WIN32,              // MGL on Win32
   wxMGL_OS2                 // MGL on OS/2
 };
   wxMGL_WIN32,              // MGL on Win32
   wxMGL_OS2                 // MGL on OS/2
 };


@@ -420,53 +450,53 @@ enum
 // fixed length types
 
 #define wxInt8    char    signed
 // fixed length types
 
 #define wxInt8    char    signed

-#define wxUint8   char  unsigned  
+#define wxUint8   char  unsigned

 
 #ifdef __WIN16__
 
 #ifdef __WIN16__

-#define wxInt16    int    signed  
-#define wxUint16   int  unsigned  
-#define wxInt32   long    signed  
-#define wxUint32  long  unsigned  
+#define wxInt16    int    signed
+#define wxUint16   int  unsigned
+#define wxInt32   long    signed
+#define wxUint32  long  unsigned

 #endif
 
 #ifdef __WIN32__
 #endif
 
 #ifdef __WIN32__

-#define wxInt16  short    signed  
-#define wxUint16 short  unsigned  
-#define wxInt32    int    signed  
-#define wxUint32   int  unsigned  
+#define wxInt16  short    signed
+#define wxUint16 short  unsigned
+#define wxInt32    int    signed
+#define wxUint32   int  unsigned

 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

-#define wxInt16  short    signed  
-#define wxUint16 short  unsigned  
-#define wxInt32    int    signed  
-#define wxUint32   int  unsigned  
+#define wxInt16  short    signed
+#define wxUint16 short  unsigned
+#define wxInt32    int    signed
+#define wxUint32   int  unsigned

 #endif
 
 #ifdef __WXOS2__
 #endif
 
 #ifdef __WXOS2__

-#define wxInt16  short    signed  
-#define wxUint16 short  unsigned  
-#define wxInt32    int    signed  
-#define wxUint32   int  unsigned  
+#define wxInt16  short    signed
+#define wxUint16 short  unsigned
+#define wxInt32    int    signed
+#define wxUint32   int  unsigned

 #endif
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__)
   #if defined(SIZEOF_INT)
     /* well, this shouldn't happen... */
 #endif
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__)
   #if defined(SIZEOF_INT)
     /* well, this shouldn't happen... */

-    #define wxInt16  short    signed  
-    #define wxUint16 short  unsigned  
-    #define wxInt32    int    signed  
-    #define wxUint32   int  unsigned  
+    #define wxInt16  short    signed
+    #define wxUint16 short  unsigned
+    #define wxInt32    int    signed
+    #define wxUint32   int  unsigned

   #else
   #else

-    #define wxInt16  short    signed  
-    #define wxUint16 short  unsigned  
-    #define wxInt32    int    signed  
-    #define wxUint32   int  unsigned  
+    #define wxInt16  short    signed
+    #define wxUint16 short  unsigned
+    #define wxInt32    int    signed
+    #define wxUint32   int  unsigned

   #endif
 #endif
 
 #define  wxByte   wxUint8
   #endif
 #endif
 
 #define  wxByte   wxUint8

-#define  wxWord   wxUint16        
+#define  wxWord   wxUint16

 
 // byte sex
 
 
 // byte sex
 


@@ -486,12 +516,12 @@ enum
    ((wxUint16) ( \
     (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \
     (((wxUint16) (val) & (wxUint16) 0xff00U) >> 8)))
    ((wxUint16) ( \
     (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \
     (((wxUint16) (val) & (wxUint16) 0xff00U) >> 8)))

-    
+

 #define wxINT16_SWAP_ALWAYS(val) \
    ((wxInt16) ( \
     (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \
     (((wxUint16) (val) & (wxUint16) 0xff00U) >> 8)))
 #define wxINT16_SWAP_ALWAYS(val) \
    ((wxInt16) ( \
     (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \
     (((wxUint16) (val) & (wxUint16) 0xff00U) >> 8)))

-    
+

 #define wxUINT32_SWAP_ALWAYS(val) \
    ((wxUint32) ( \
     (((wxUint32) (val) & (wxUint32) 0x000000ffU) << 24) | \
 #define wxUINT32_SWAP_ALWAYS(val) \
    ((wxUint32) ( \
     (((wxUint32) (val) & (wxUint32) 0x000000ffU) << 24) | \


@@ -583,9 +613,12 @@ enum
 #define wxWANTS_CHARS           0x00040000
 
 // Make window retained (mostly Motif, I think)
 #define wxWANTS_CHARS           0x00040000
 
 // Make window retained (mostly Motif, I think)

-#define wxRETAINED              0x0002000
+#define wxRETAINED              0x00020000

 #define wxBACKINGSTORE          wxRETAINED
 
 #define wxBACKINGSTORE          wxRETAINED
 

+// don't invalidate the whole window (resulting in a PAINT event) when the
+// window is resized (currently, makes sense for wxMSW only)
+#define wxNO_FULL_REPAINT_ON_RESIZE 0x00010000

 /*
  * wxFrame/wxDialog style flags
  */
 /*
  * wxFrame/wxDialog style flags
  */


@@ -693,6 +726,9 @@ enum
 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020
 #define wxTE_PROCESS_TAB    0x0040
 #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

 
 /*
  * wxComboBox style flags
 
 /*
  * wxComboBox style flags


@@ -703,18 +739,18 @@ enum
 #define wxCB_DROPDOWN       0x0020
 
 /*
 #define wxCB_DROPDOWN       0x0020
 
 /*

- * wxRadioBox/wxRadioButton style flags
+ * wxRadioBox style flags

  */
  */

- 

 // New, more intuitive names to specify majorDim argument
 // 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
-
+#define wxRA_SPECIFY_COLS   wxHORIZONTAL
+#define wxRA_SPECIFY_ROWS   wxVERTICAL

 // Old names for compatibility
 #define wxRA_HORIZONTAL     wxHORIZONTAL
 #define wxRA_VERTICAL       wxVERTICAL
 // Old names for compatibility
 #define wxRA_HORIZONTAL     wxHORIZONTAL
 #define wxRA_VERTICAL       wxVERTICAL

+
+/*
+ * wxRadioButton style flag
+ */

 #define wxRB_GROUP          0x0004
 
 /*
 #define wxRB_GROUP          0x0004
 
 /*


@@ -765,7 +801,7 @@ enum
 #define wxTR_SINGLE          0x0000
 #define wxTR_MULTIPLE        0x0020
 #define wxTR_EXTENDED        0x0040
 #define wxTR_SINGLE          0x0000
 #define wxTR_MULTIPLE        0x0020
 #define wxTR_EXTENDED        0x0040

-#define wxTR_HAS_VARIABLE_ROW_HIGHT 0x0080
+#define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080

 
 /*
  * wxListCtrl flags
 
 /*
  * wxListCtrl flags


@@ -853,10 +889,10 @@ enum
 #define wxPD_REMAINING_TIME     0x0020
 
 /*
 #define wxPD_REMAINING_TIME     0x0020
 
 /*

- * extended dialog specifiers. these values are stored in a different 
+ * extended dialog specifiers. these values are stored in a different

  * flag and thus do not overlap with other style flags. note that these
  * values do not correspond to the return values of the dialogs (for
  * flag and thus do not overlap with other style flags. note that these
  * values do not correspond to the return values of the dialogs (for

- * those values, look at the wxID_XXX defines). 
+ * those values, look at the wxID_XXX defines).

  */
 #define wxOK                    0x00000001
 #define wxYES_NO                0x00000002
  */
 #define wxOK                    0x00000001
 #define wxYES_NO                0x00000002


@@ -967,8 +1003,8 @@ enum wxDirection
 
 // wxCENTRE                   = 0x0400 (defined above)
 
 
 // wxCENTRE                   = 0x0400 (defined above)
 

-// centering into frame rather than screen 
-#define wxCENTER_FRAME          0x0004  
+// centering into frame rather than screen
+#define wxCENTER_FRAME          0x0004

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -1348,8 +1384,8 @@ typedef enum {
 // platform specific (implementation) parts of the headers
 // ---------------------------------------------------------------------------
 
 // platform specific (implementation) parts of the headers
 // ---------------------------------------------------------------------------
 

-#ifdef __WXMSW__
-// Stand-ins for Windows types, to avoid #including all of windows.h
+#if defined(__WXMSW__) || defined(__WXPM__)
+// Stand-ins for Windows types or OS/2, to avoid #including all of windows.h or os2.h

 typedef unsigned long   WXHWND;
 typedef unsigned long   WXHANDLE;
 typedef unsigned long   WXHICON;
 typedef unsigned long   WXHWND;
 typedef unsigned long   WXHANDLE;
 typedef unsigned long   WXHICON;