Added convenience form of wxEvtHandler::Connect, only one id; changed

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index e50e07a8040d65b3868f7ca2b24f9bb5eedd7848..d3ba9b0e0e2a7ea193d7580c83a05c6edbe6eb2e 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -311,8 +311,10 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
 // where should i put this? we need to make sure of this as it breaks
 // the <iostream> code.
 #if !wxUSE_IOSTREAMH && defined(__WXDEBUG__)
+#ifndef __MWERKS__
 #undef __WXDEBUG__
 #endif
+#endif
 
 // Callback function type definition
 typedef void (*wxFunction) (wxObject&, wxEvent&);
@@ -940,8 +942,10 @@ typedef void *          WXMEASUREITEMSTRUCT;
 typedef void *          WXLPCREATESTRUCT;
 #ifdef __GNUWIN32__
 typedef int (*WXFARPROC)();
-#else
+#elif defined(__WIN32__)
 typedef int (__stdcall *WXFARPROC)();
+#else
+typedef int (*WXFARPROC)();
 #endif
 
 #endif