Checking for wxUSE_SOCKETS and __GSOCKET_STANDALONE__ should be right, now

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index c908c55ce86bd8697cd52786a206a915b5d95260..e35d3e8c9785fb060291e6fa50ca478b7793d45e 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -810,6 +810,7 @@ enum wxStretch
 // and Win32 and is silently ignored under all other platforms
 #define wxTE_RICH           0x0080
 #define wxTE_NO_VSCROLL     0x0100
+#define wxTE_AUTO_SCROLL    0x0200
 
 /*
  * wxComboBox style flags
@@ -1066,6 +1067,8 @@ enum wxStretch
 #define wxID_SETUP              5110
 #define wxID_RESET              5111
 
+// IDs used by generic file dialog (11 consecutive starting from this value)
+#define wxID_FILEDLGG           5900
 #define wxID_HIGHEST            5999
 
 // ----------------------------------------------------------------------------