Added wxTE_NO_VSCROLL style; corrected joystick event class

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp
index 5e870cdc92250756ccf0713a55db378c9b8013f4..29341786163f021bd5ac516fe35b4c7d5e9687f0 100644 (file)
--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -52,6 +52,7 @@ src/msw/*.lst
 src/msw/*.def
 src/msw/*.inc
 src/msw/winestub.c
+src/msw/gsocket.c
 
 src/msw/ctl3d/*.*
 src/msw/ctl3d/msvc/*.*

diff --git a/include/wx/defs.h b/include/wx/defs.h
index ad599a5693bd201b5be8f5972e0c4309526ce2fc..c908c55ce86bd8697cd52786a206a915b5d95260 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -809,6 +809,7 @@ 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
+#define wxTE_NO_VSCROLL     0x0100
 
 /*
  * wxComboBox style flags

diff --git a/include/wx/event.h b/include/wx/event.h
index 5598cf8d2562855a4e03451b8b4422a0370026be..71c3bcfb6167930f80e238ae057b0c7ffd959b02 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -1017,7 +1017,7 @@ public:
 
     // Was it a button event? (*doesn't* mean: is any button *down*?)
     bool IsButton() const { return ((GetEventType() == wxEVT_JOY_BUTTON_DOWN) ||
-            (GetEventType() == wxEVT_JOY_BUTTON_DOWN)); }
+            (GetEventType() == wxEVT_JOY_BUTTON_UP)); }
 
     // Was it a move event?
     bool IsMove() const { return (GetEventType() == wxEVT_JOY_MOVE) ; }

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index 7724ad4b3e554dd5d40259608b08187c5a748c1f..f274e4648efb0bba068fac3e0de42303d0816a3e 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -1813,6 +1813,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { _T("wxTE_READONLY"), wxTE_READONLY},
   { _T("wxTE_PROCESS_ENTER"), wxTE_PROCESS_ENTER},
   { _T("wxTE_MULTILINE"), wxTE_MULTILINE},
+  { _T("wxTE_NO_VSCROLL"), wxTE_NO_VSCROLL},
 
   /* wxRadioBox/wxRadioButton */
   { _T("wxRB_GROUP"), wxRB_GROUP },

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 6770cc598c17317d9d26a356d1a8a0ca2818d729..fa88d2dc95537cbe8481ea33cd333ecfa974f5cc 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -131,7 +131,9 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
                       _T("wxTE_PROCESS_ENTER style is ignored for multiline "
                          "text controls (they always process it)") );
 
-        msStyle |= ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL;
+        msStyle |= ES_MULTILINE | ES_WANTRETURN;
+        if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)
+            msStyle |= WS_VSCROLL;
         m_windowStyle |= wxTE_PROCESS_ENTER;
     }
     else