1) APPCONF_ constants renamed to wxCONFIG_

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 3b77dd23c4ac07d5e40952d494e5627e355586fa..6734839262e4e9fad185bbef1469b6ac02fb892f 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -16,7 +16,7 @@
 #pragma interface "defs.h"
 #endif
 
-#ifdef __GTK__
+#ifdef __WXGTK__
 
 #include "glib.h"
 #include "gdk/gdk.h"
@@ -43,14 +43,14 @@
 //////////////////////////////////////////////////////////////////////////////////
 // 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__
+#elif defined(__WXMSW__) || defined(__WINDOWS_386__) || defined(__NT__) || defined(__MSDOS__) 
+# ifndef __WXMSW__
+#  define __WXMSW__
 # endif
 #endif
 
@@ -68,13 +68,13 @@
 #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(__MAC__) && !defined(__X__)
+#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__MAC__]"
 #endif
 
-#if defined(__MOTIF__) || defined(__GTK__)
+#if defined(__WXMOTIF__) || defined(__WXGTK__)
 
 // Bool is now obsolete, use bool instead
 // typedef int Bool;
@@ -85,7 +85,7 @@
 # define Bool_DEFINED
 #endif
 
-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)
 
 #ifndef TRUE
 # define TRUE  1
@@ -119,7 +119,7 @@ typedef int wxWindowID;
  * Making or using wxWindows as a Windows DLL
  */
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 
 #ifdef __BORLANDC__
 
@@ -230,8 +230,8 @@ enum  ErrCode
 #endif
 
 #ifndef __UNIX__                     // Windows
-  #ifndef __WINDOWS__
-    #define __WINDOWS__
+  #ifndef __WXMSW__
+    #define __WXMSW__
   #endif
 
   #if   defined(_MSC_VER)
@@ -248,7 +248,7 @@ 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"
@@ -309,7 +309,7 @@ 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 wxCLIP_CHILDREN     0x00400000
@@ -367,6 +367,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
@@ -478,6 +482,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 
 #define wxTR_HAS_BUTTONS     0x0004
 #define wxTR_EDIT_LABELS     0x0008
+#define wxTR_LINES_AT_ROOT   0x0010
 
 /*
  * wxListCtrl flags
@@ -662,26 +667,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,
@@ -830,7 +844,7 @@ enum {
 #define wxID_YES                5103
 #define wxID_NO                 5104
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 // Stand-ins for Windows types, to avoid
 // #including all of windows.h
 
@@ -855,7 +869,6 @@ 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;
@@ -866,8 +879,5 @@ typedef int (*WXFARPROC)();
 
 #endif
 
-// for drag & drop and clipboard operations
-typedef unsigned short wxDataFormat;
-
 #endif
     // __WXDEFSH__