removing scroll flags before instantiation the base class

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 5240ef76be94d96be09909d790a70ed8258a2712..d5c590caeb37523d6c210fec38887eae35704ca3 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -202,7 +202,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxValidator& validator,
                        const wxString& name)
 {
                        const wxValidator& validator,
                        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;
 
     m_noItems = 0 ; // this will be increased by our append command
         return false;
 
     m_noItems = 0 ; // this will be increased by our append command

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 183c86981c919257767f1213a242fde3dad3f4af..90871927da1b9822193d6fdf24188f0c2b6d17bc 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -683,7 +683,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     m_macUsesTXN &= (TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress) ;
 
     // base initialization
     m_macUsesTXN &= (TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress) ;
 
     // 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;
 
     wxSize mySize = size ;
         return FALSE;
 
     wxSize mySize = size ;

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index 5240ef76be94d96be09909d790a70ed8258a2712..d5c590caeb37523d6c210fec38887eae35704ca3 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -202,7 +202,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxValidator& validator,
                        const wxString& name)
 {
                        const wxValidator& validator,
                        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;
 
     m_noItems = 0 ; // this will be increased by our append command
         return false;
 
     m_noItems = 0 ; // this will be increased by our append command

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index 183c86981c919257767f1213a242fde3dad3f4af..90871927da1b9822193d6fdf24188f0c2b6d17bc 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -683,7 +683,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     m_macUsesTXN &= (TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress) ;
 
     // base initialization
     m_macUsesTXN &= (TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress) ;
 
     // 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;
 
     wxSize mySize = size ;
         return FALSE;
 
     wxSize mySize = size ;