second try...

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 71c80d3284c449efae782eda03d6c5948d9aeed1..9f4da9c1a38565930422e125dbb5f86ba83a02d6 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -109,7 +109,7 @@
 // Currently Only MS-Windows/NT, XView and Motif are supported
 //
 #if defined(__HPUX__) && !defined(__WXGTK__)
-    #ifndef __WXMOTIF__  
+    #ifndef __WXMOTIF__
         #define __WXMOTIF__
     #endif // __WXMOTIF__
 #endif
@@ -408,7 +408,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxMINIMIZE              wxICONIZE
 #define wxMAXIMIZE              0x2000
 #define wxTHICK_FRAME           0x1000
-#define wxSYSTEM_MENU           0x0800 
+#define wxSYSTEM_MENU           0x0800
 #define wxMINIMIZE_BOX          0x0400
 #define wxMAXIMIZE_BOX          0x0200
 #define wxTINY_CAPTION_HORIZ    0x0100
@@ -432,7 +432,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #else
 // Under Unix, the dialogs don't have a system menu. Specifying
 // wxSYSTEM_MENU here, will make a close button appear.
-#   define wxDEFAULT_DIALOG_STYLE  (wxCAPTION) 
+#   define wxDEFAULT_DIALOG_STYLE  (wxCAPTION)
 #endif
 
 
@@ -567,6 +567,11 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxTR_EDIT_LABELS     0x0008
 #define wxTR_LINES_AT_ROOT   0x0010
 
+#define wxTR_SINGLE          0x0000
+#define wxTR_MULTIPLE        0x0020
+#define wxTR_EXTENDED        0x0040
+#define wxTR_HAS_VARIABLE_ROW_HIGHT 0x0080
+
 /*
  * wxListCtrl flags
  */
@@ -646,7 +651,12 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxLI_HORIZONTAL      wxHORIZONTAL
 #define wxLI_VERTICAL        wxVERTICAL
 
-
+/*
+ * wxProgressDialog flags
+ */
+#define wxPD_CAN_ABORT      0x0001
+#define wxPD_APP_MODAL      0x0002
+#define wxPD_AUTO_HIDE      0x0004
 
 /*
  * GDI descriptions
@@ -778,9 +788,7 @@ typedef enum
 // Don't do parent client adjustments (for implementation only)
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 
-#ifndef __WXGTK__
-
-enum wxDataFormat
+enum wxDataFormatId
 {
   wxDF_INVALID =          0,
   wxDF_TEXT =             1,  /* CF_TEXT */
@@ -799,11 +807,10 @@ enum wxDataFormat
   wxDF_ENHMETAFILE =      14,
   wxDF_FILENAME =         15, /* CF_HDROP */
   wxDF_LOCALE =           16,
-  wxDF_PRIVATE =          20
+  wxDF_PRIVATE =          20,
+  wxDF_MAX
 };
 
-#endif
-
 /* Virtual keycodes */
 
 enum wxKeyCode
@@ -822,6 +829,7 @@ enum wxKeyCode
   WXK_MBUTTON,
   WXK_CLEAR,
   WXK_SHIFT,
+  WXK_ALT,
   WXK_CONTROL,
   WXK_MENU,
   WXK_PAUSE,
@@ -884,7 +892,7 @@ enum wxKeyCode
   WXK_SCROLL,
   WXK_PAGEUP,
   WXK_PAGEDOWN,
- 
+
   WXK_NUMPAD_SPACE,
   WXK_NUMPAD_TAB,
   WXK_NUMPAD_ENTER,