Misc. Motif; removed duplicate wxICON; variant compile fix; added wxString form

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 22c8db9a999f8408e16161e05b6f11ec8d16e909..6271188f533447a91df56576957f58d87e98666a 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -280,6 +280,19 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
 
 #endif  // VC++
 
+#if _MSC_VER > 1010
+#undef try
+#undef except
+#undef finally
+#define except(x) catch(...)
+#endif
+
+// where should i put this? we need to make sure of this as it breaks
+// the <iostream> code.
+#if !wxUSE_IOSTREAMH && WXDEBUG
+#undef WXDEBUG
+#endif
+
 // Callback function type definition
 typedef void (*wxFunction) (wxObject&, wxEvent&);
 
@@ -829,6 +842,7 @@ enum {
 #define wxID_CLEAR              5033
 #define wxID_FIND               5034
 #define wxID_DUPLICATE          5035
+#define wxID_SELECTALL          5036
 
 #define wxID_FILE1              5050
 #define wxID_FILE2              5051
@@ -849,6 +863,9 @@ enum {
 
 #define wxID_HIGHEST            5999
 
+// Shortcut for easier dialog-unit-to-pixel conversion
+#define wxDLG_UNIT(parent, pt) parent->ConvertDialogToPixels(pt)
+
 #ifdef __WXMSW__
 // Stand-ins for Windows types, to avoid
 // #including all of windows.h