moved wxDash typedef to gdicmn.h

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 6eba12944614ef6a31794405a98ce05c55751a69..bd68bd96991c32b18a0d35dbd103452560dcb378 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1169,6 +1169,8 @@ enum wxStretch
 #define wxPD_ELAPSED_TIME       0x0008
 #define wxPD_ESTIMATED_TIME     0x0010
 // wxGA_SMOOTH = 0x0020 may also be used with wxProgressDialog
 #define wxPD_ELAPSED_TIME       0x0008
 #define wxPD_ESTIMATED_TIME     0x0010
 // wxGA_SMOOTH = 0x0020 may also be used with wxProgressDialog

+// NO!!! This is wxDIALOG_MODAL and will cause the progress dialog to
+// be modal. No progress will then be made at all.

 #define wxPD_REMAINING_TIME     0x0040
 
 /*
 #define wxPD_REMAINING_TIME     0x0040
 
 /*


@@ -1226,11 +1228,6 @@ enum wxStretch
 // id for a separator line in the menu (invalid for normal item)
 #define wxID_SEPARATOR (-1)
 
 // id for a separator line in the menu (invalid for normal item)
 #define wxID_SEPARATOR (-1)
 

-// this one is for compatibility only, don't use in new code
-#ifndef ID_SEPARATOR
-    #define ID_SEPARATOR    wxID_SEPARATOR
-#endif
-

 // Standard menu IDs
 #define wxID_LOWEST             4999
 
 // Standard menu IDs
 #define wxID_LOWEST             4999