wxLaunchDefaultBrowser() now supports wxBROWSER_NEW_WINDOW flag (and it actually...

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 3bf1cd275e0309985ea435d80e0e5a89768b9fc0..b18f62f9d5e2dc0d5cc56104cf87abf1e521797f 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -292,6 +292,13 @@ typedef int wxWindowID;
     #define wx_reinterpret_cast(t, x) ((t)(x))
 #endif
 
     #define wx_reinterpret_cast(t, x) ((t)(x))
 #endif
 

+/*
+   This one is a wx invention: like static cast but used when we intentionally
+   truncate from a larger to smaller type, static_cast<> can't be used for it
+   as it results in warnings when using some compilers (SGI mipspro for example)
+ */
+#define wx_truncate_cast(t, x) ((t)(x))
+

 /* for consistency with wxStatic/DynamicCast defined in wx/object.h */
 #define wxConstCast(obj, className) wx_const_cast(className *, obj)
 
 /* for consistency with wxStatic/DynamicCast defined in wx/object.h */
 #define wxConstCast(obj, className) wx_const_cast(className *, obj)
 


@@ -1616,10 +1623,8 @@ enum wxBackgroundStyle
 /*  Standard menu IDs */
 enum
 {
 /*  Standard menu IDs */
 enum
 {

-#if wxABI_VERSION >= 20602

     /* no id matches this one when compared to it */
     wxID_NONE = -3,
     /* no id matches this one when compared to it */
     wxID_NONE = -3,

-#endif

 
     /*  id for a separator line in the menu (invalid for normal item) */
     wxID_SEPARATOR = -2,
 
     /*  id for a separator line in the menu (invalid for normal item) */
     wxID_SEPARATOR = -2,


@@ -1802,6 +1807,11 @@ enum wxHitTest
 /*  Don't do parent client adjustments (for implementation only) */
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 
 /*  Don't do parent client adjustments (for implementation only) */
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 

+#if wxABI_VERSION >= 20602
+/*  Change the window position even if it seems to be already correct */
+#define wxSIZE_FORCE            0x0010
+#endif // 2.6.2+
+

 /*  ---------------------------------------------------------------------------- */
 /*  GDI descriptions */
 /*  ---------------------------------------------------------------------------- */
 /*  ---------------------------------------------------------------------------- */
 /*  GDI descriptions */
 /*  ---------------------------------------------------------------------------- */