X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..524761867cd4ebcb4e421ccc9879f95a851e764a:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 20ef449029..aac88fdfa9 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -309,11 +309,14 @@ 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 wxOVERRIDE_KEY_TRANSLATIONS 0x00400000
-                                 // TODO: do we need this??? (Motif only)
+#define wxCLIP_CHILDREN     0x00400000
+                                 // Clip children when painting, which reduces flicker in
+                                 // e.g. frames and splitter windows, but can't be used in
+                                 // a panel where a static box must be 'transparent' (panel
+                                 // paints the background for it)
 
 // Add this style to a panel to get tab traversal working
 // outside of dialogs.
@@ -343,7 +346,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxDIALOG_MODAL      0x0020
 #define wxDIALOG_MODELESS   0x0000
 
-#define wxDEFAULT_FRAME_STYLE    (wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION)
+#define wxDEFAULT_FRAME_STYLE    (wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN)
 
 #if WXWIN_COMPATIBILITY
 #define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE
@@ -364,6 +367,8 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
  */
  
 #define wxTB_3DBUTTONS      0x8000
+// Flatbar/Coolbar under Win98
+#define wxTB_FLAT           0x0002
 
 /*
  * Apply to all panel items
@@ -475,6 +480,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 
 #define wxTR_HAS_BUTTONS     0x0004
 #define wxTR_EDIT_LABELS     0x0008
+#define wxTR_LINES_AT_ROOT   0x0010
 
 /*
  * wxListCtrl flags
@@ -531,11 +537,17 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxTAB_FIXEDWIDTH    0x0008
 #define wxTAB_OWNERDRAW     0x0010
 
+// Sorry, I changed my mind about these names...
+#define wxTC_MULTILINE     0x0000
+#define wxTC_RIGHTJUSTIFY  0x0004
+#define wxTC_FIXEDWIDTH    0x0008
+#define wxTC_OWNERDRAW     0x0010
+
 /*
  * wxStatusBar95 flags
  */
 
-#define wxSB_SIZEGRIP       0x0002
+#define wxST_SIZEGRIP       0x0002
 
 /*
  * GDI descriptions
@@ -857,5 +869,8 @@ typedef int (*WXFARPROC)();
 
 #endif
 
+// for drag & drop and clipboard operations
+typedef unsigned short wxDataFormat;
+
 #endif
     // __WXDEFSH__