minor changes to registry classes and wxIniConfig added

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index fa02c39ec5fbec57272a0e663904633849664cb8..099c48b6ae65cf6abe4927bbb8822159d35d28ae 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -367,8 +367,10 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
  */
  
 #define wxTB_3DBUTTONS      0x8000
  */
  
 #define wxTB_3DBUTTONS      0x8000

+#define wxTB_HORIZONTAL     0x0002
+#define wxTB_VERTICAL       0x0004

 // Flatbar/Coolbar under Win98
 // Flatbar/Coolbar under Win98

-#define wxTB_FLAT           0x0002
+#define wxTB_FLAT           0x0008

 
 /*
  * Apply to all panel items
 
 /*
  * Apply to all panel items


@@ -665,26 +667,35 @@ typedef enum {
 // Possible SetSize flags
 
 // Use internally-calculated width if -1
 // 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
 // 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
 // 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.
 // 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
 // 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
 
 // Virtual keycodes

+

 enum _Virtual_keycodes {
  WXK_BACK    =   8,
  WXK_TAB     =   9,
 enum _Virtual_keycodes {
  WXK_BACK    =   8,
  WXK_TAB     =   9,


@@ -847,6 +858,7 @@ typedef unsigned long   WXHBRUSH;
 typedef unsigned long   WXHPALETTE;
 typedef unsigned long   WXHCURSOR;
 typedef unsigned long   WXHRGN;
 typedef unsigned long   WXHPALETTE;
 typedef unsigned long   WXHCURSOR;
 typedef unsigned long   WXHRGN;

+typedef unsigned long   WXHACCEL;

 typedef unsigned long   WXHINSTANCE;
 typedef unsigned long   WXHBITMAP;
 typedef unsigned long   WXHIMAGELIST;
 typedef unsigned long   WXHINSTANCE;
 typedef unsigned long   WXHBITMAP;
 typedef unsigned long   WXHIMAGELIST;


@@ -858,7 +870,6 @@ typedef unsigned short  WXWORD;
 typedef unsigned int    WXWPARAM;
 typedef long            WXLPARAM;
 typedef unsigned long   WXCOLORREF;
 typedef unsigned int    WXWPARAM;
 typedef long            WXLPARAM;
 typedef unsigned long   WXCOLORREF;

-typedef void *          WXRGN;

 typedef void *          WXRGNDATA;
 typedef void *          WXMSG;
 typedef unsigned long   WXHCONV;
 typedef void *          WXRGNDATA;
 typedef void *          WXMSG;
 typedef unsigned long   WXHCONV;


@@ -869,8 +880,5 @@ typedef int (*WXFARPROC)();
 
 #endif
 
 
 #endif
 

-// for drag & drop and clipboard operations
-typedef unsigned short wxDataFormat;
-

 #endif
     // __WXDEFSH__
 #endif
     // __WXDEFSH__