Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added wxTE_NO_VSCROLL style; corrected joystick event class

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-09-08 08:29:49 +00:00
parent 2618484fed
commit b70ababc14
5 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distrib/msw/msw.rsp
View File

@@ -52,6 +52,7 @@ src/msw/*.lst
src/msw/*.def src/msw/*.def
src/msw/*.inc src/msw/*.inc
src/msw/winestub.c src/msw/winestub.c
src/msw/gsocket.c
src/msw/ctl3d/*.* src/msw/ctl3d/*.*
src/msw/ctl3d/msvc/*.* src/msw/ctl3d/msvc/*.*

1
include/wx/defs.h
View File

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

2
include/wx/event.h
View File

@@ -1017,7 +1017,7 @@ public:
// Was it a button event? (*doesn't* mean: is any button *down*?) // Was it a button event? (*doesn't* mean: is any button *down*?)
bool IsButton() const { return ((GetEventType() == wxEVT_JOY_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? // Was it a move event?
bool IsMove() const { return (GetEventType() == wxEVT_JOY_MOVE) ; } bool IsMove() const { return (GetEventType() == wxEVT_JOY_MOVE) ; }

1
src/common/resource.cpp
View File

@@ -1813,6 +1813,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
{ _T("wxTE_READONLY"), wxTE_READONLY}, { _T("wxTE_READONLY"), wxTE_READONLY},
{ _T("wxTE_PROCESS_ENTER"), wxTE_PROCESS_ENTER}, { _T("wxTE_PROCESS_ENTER"), wxTE_PROCESS_ENTER},
{ _T("wxTE_MULTILINE"), wxTE_MULTILINE}, { _T("wxTE_MULTILINE"), wxTE_MULTILINE},
{ _T("wxTE_NO_VSCROLL"), wxTE_NO_VSCROLL},
/* wxRadioBox/wxRadioButton */ /* wxRadioBox/wxRadioButton */
{ _T("wxRB_GROUP"), wxRB_GROUP }, { _T("wxRB_GROUP"), wxRB_GROUP },

4
src/msw/textctrl.cpp
View File

@@ -131,7 +131,9 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
_T("wxTE_PROCESS_ENTER style is ignored for multiline " _T("wxTE_PROCESS_ENTER style is ignored for multiline "
"text controls (they always process it)") ); "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; m_windowStyle |= wxTE_PROCESS_ENTER;
} }
else else