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

Add support for wxTE_NO_VSCROLL style to wxTextCtrl (wxOSX)

Browse Source
This commit is contained in:
Artur Wieczorek
2017-08-02 21:26:51 +02:00
parent 794e1b275b
commit 1731ad5e31
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -225,6 +225,7 @@ wxOSX:
- Allow turning on/off opacity selector in wxColourDialog. - Allow turning on/off opacity selector in wxColourDialog.
- Implement wxTextCtrl::PositionToXY() and XYToPosition(). - Implement wxTextCtrl::PositionToXY() and XYToPosition().
- Implement wxTextCtrl::ShowPosition(). - Implement wxTextCtrl::ShowPosition().
- Add support for wxTE_NO_VSCROLL style to wxTextCtrl.
Unix: Unix:

4
interface/wx/textctrl.h
View File

@@ -976,8 +976,8 @@ public:
@style{wxTE_NO_VSCROLL} @style{wxTE_NO_VSCROLL}
For multiline controls only: vertical scrollbar will never be For multiline controls only: vertical scrollbar will never be
created. This limits the amount of text which can be entered into created. This limits the amount of text which can be entered into
the control to what can be displayed in it under MSW but not under the control to what can be displayed in it under wxMSW but not under
GTK2. Currently not implemented for the other platforms. wxGTK or wxOSX. Currently not implemented for the other platforms.
@style{wxTE_LEFT} @style{wxTE_LEFT}
The text in the control will be left-justified (default). The text in the control will be left-justified (default).
@style{wxTE_CENTRE} @style{wxTE_CENTRE}

1
src/osx/cocoa/textctrl.mm
View File

@@ -716,6 +716,7 @@ wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w, long s
[m_scrollView setHasVerticalScroller:YES]; [m_scrollView setHasVerticalScroller:YES];
[m_scrollView setHasHorizontalScroller:hasHScroll]; [m_scrollView setHasHorizontalScroller:hasHScroll];
[m_scrollView setHasVerticalScroller:(style & wxTE_NO_VSCROLL)? NO: YES];
NSSize contentSize = [m_scrollView contentSize]; NSSize contentSize = [m_scrollView contentSize];
NSRect viewFrame = NSMakeRect( NSRect viewFrame = NSMakeRect(
0, 0, 0, 0,