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 48d5bbd3ce04bcd9c36ec0bb71dba5e191a48044..e35d3e8c9785fb060291e6fa50ca478b7793d45e 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -133,7 +133,7 @@
 #if defined(__HPUX__) && defined(__GNUG__)
     #define va_list __gnuc_va_list
 #endif // HP-UX
 #if defined(__HPUX__) && defined(__GNUG__)
     #define va_list __gnuc_va_list
 #endif // HP-UX

-    
+

 // Mingw32 gcc-2.95 uses new windows headers which are more ms-like
 // we are setting this define because of the complex check
 // using NORLANDER as Cygwin may follow. (header author is Anders Norlander)
 // Mingw32 gcc-2.95 uses new windows headers which are more ms-like
 // we are setting this define because of the complex check
 // using NORLANDER as Cygwin may follow. (header author is Anders Norlander)


@@ -603,7 +603,7 @@ enum wxOrientation
 {
     wxHORIZONTAL              = 0x0004,
     wxVERTICAL                = 0x0008,
 {
     wxHORIZONTAL              = 0x0004,
     wxVERTICAL                = 0x0008,

-    
+

     wxBOTH                    = (wxVERTICAL | wxHORIZONTAL)
 };
 
     wxBOTH                    = (wxVERTICAL | wxHORIZONTAL)
 };
 


@@ -613,15 +613,15 @@ enum wxDirection
     wxRIGHT                   = 0x0020,
     wxUP                      = 0x0040,
     wxDOWN                    = 0x0080,
     wxRIGHT                   = 0x0020,
     wxUP                      = 0x0040,
     wxDOWN                    = 0x0080,

-    
+

     wxTOP                     = wxUP,
     wxBOTTOM                  = wxDOWN,
     wxTOP                     = wxUP,
     wxBOTTOM                  = wxDOWN,

-    
+

     wxNORTH                   = wxUP,
     wxSOUTH                   = wxDOWN,
     wxWEST                    = wxLEFT,
     wxEAST                    = wxRIGHT,
     wxNORTH                   = wxUP,
     wxSOUTH                   = wxDOWN,
     wxWEST                    = wxLEFT,
     wxEAST                    = wxRIGHT,

-    
+

     wxALL                     = (wxUP | wxDOWN | wxRIGHT | wxLEFT)
 };
 
     wxALL                     = (wxUP | wxDOWN | wxRIGHT | wxLEFT)
 };
 


@@ -809,6 +809,8 @@ enum wxStretch
 // this style means to use RICHEDIT control and does something only under wxMSW
 // and Win32 and is silently ignored under all other platforms
 #define wxTE_RICH           0x0080
 // this style means to use RICHEDIT control and does something only under wxMSW
 // 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
 
 /*
  * wxComboBox style flags


@@ -840,16 +842,16 @@ enum wxStretch
 #define wxGA_HORIZONTAL      wxHORIZONTAL
 #define wxGA_VERTICAL        wxVERTICAL
 // Windows only
 #define wxGA_HORIZONTAL      wxHORIZONTAL
 #define wxGA_VERTICAL        wxVERTICAL
 // Windows only

-#define wxGA_SMOOTH          0x0008
+#define wxGA_SMOOTH          0x0010

 
 /*
  * wxSlider flags
  */
 
 /*
  * wxSlider flags
  */

-#define wxSL_HORIZONTAL      wxHORIZONTAL
-#define wxSL_VERTICAL        wxVERTICAL
+#define wxSL_HORIZONTAL      wxHORIZONTAL // 4
+#define wxSL_VERTICAL        wxVERTICAL   // 8

 // The next one is obsolete - use scroll events instead
 #define wxSL_NOTIFY_DRAG     0x0000
 // The next one is obsolete - use scroll events instead
 #define wxSL_NOTIFY_DRAG     0x0000

-#define wxSL_AUTOTICKS       0x0008
+#define wxSL_AUTOTICKS       0x0010

 // #define wxSL_MANUALTICKS     0x0010
 #define wxSL_LABELS          0x0020
 #define wxSL_LEFT            0x0040
 // #define wxSL_MANUALTICKS     0x0010
 #define wxSL_LABELS          0x0020
 #define wxSL_LEFT            0x0040


@@ -1065,6 +1067,8 @@ enum wxStretch
 #define wxID_SETUP              5110
 #define wxID_RESET              5111
 
 #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
 
 // ----------------------------------------------------------------------------
 #define wxID_HIGHEST            5999
 
 // ----------------------------------------------------------------------------