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 f8b01d2c3337f407251e7736f43cb67689dcd187..6271188f533447a91df56576957f58d87e98666a 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -287,6 +287,12 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
 #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&);
 
@@ -836,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