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

removing scroll flags before instantiation the base class

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-09-05 14:38:03 +00:00
parent 605c7e7ed8
commit b657d5dbee
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mac/carbon/listbox.cpp
View File

@@ -202,7 +202,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
const wxValidator& validator, const wxValidator& validator,
const wxString& name) const wxString& name)
{ {
if ( !wxListBoxBase::Create(parent, id, pos, size, style, validator, name) ) if ( !wxListBoxBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
return false; return false;
m_noItems = 0 ; // this will be increased by our append command m_noItems = 0 ; // this will be increased by our append command

2
src/mac/carbon/textctrl.cpp
View File

@@ -683,7 +683,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
m_macUsesTXN &= (TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress) ; m_macUsesTXN &= (TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress) ;
// base initialization // base initialization
if ( !wxTextCtrlBase::Create(parent, id, pos, size, style, validator, name) ) if ( !wxTextCtrlBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
return FALSE; return FALSE;
wxSize mySize = size ; wxSize mySize = size ;

2
src/mac/listbox.cpp
View File

@@ -202,7 +202,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
const wxValidator& validator, const wxValidator& validator,
const wxString& name) const wxString& name)
{ {
if ( !wxListBoxBase::Create(parent, id, pos, size, style, validator, name) ) if ( !wxListBoxBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
return false; return false;
m_noItems = 0 ; // this will be increased by our append command m_noItems = 0 ; // this will be increased by our append command

2
src/mac/textctrl.cpp
View File

@@ -683,7 +683,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
m_macUsesTXN &= (TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress) ; m_macUsesTXN &= (TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress) ;
// base initialization // base initialization
if ( !wxTextCtrlBase::Create(parent, id, pos, size, style, validator, name) ) if ( !wxTextCtrlBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
return FALSE; return FALSE;
wxSize mySize = size ; wxSize mySize = size ;