undid last change and removed wxTE/CB_FILENAME style, after looking at GTK+ API it seems that this is not the correct way to do this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -250,6 +250,7 @@ void ComboboxWidgetsPage::CreateContent()
|
||||
m_chkSort = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Sort items"));
|
||||
m_chkReadonly = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Read only"));
|
||||
m_chkFilename = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&File name"));
|
||||
m_chkFilename->Disable(); // not implemented yet
|
||||
|
||||
sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
|
||||
sizerLeft->Add(m_radioKind, 0, wxGROW | wxALL, 5);
|
||||
@@ -357,8 +358,6 @@ void ComboboxWidgetsPage::CreateCombo()
|
||||
flags |= wxCB_SORT;
|
||||
if ( m_chkReadonly->GetValue() )
|
||||
flags |= wxCB_READONLY;
|
||||
if ( m_chkFilename->GetValue() )
|
||||
flags |= wxCB_FILENAME;
|
||||
|
||||
switch ( m_radioKind->GetSelection() )
|
||||
{
|
||||
@@ -396,6 +395,11 @@ void ComboboxWidgetsPage::CreateCombo()
|
||||
0, NULL,
|
||||
flags);
|
||||
|
||||
#if 0
|
||||
if ( m_chkFilename->GetValue() )
|
||||
;
|
||||
#endif // TODO
|
||||
|
||||
unsigned int count = items.GetCount();
|
||||
for ( unsigned int n = 0; n < count; n++ )
|
||||
{
|
||||
|
@@ -412,6 +412,7 @@ void TextWidgetsPage::CreateContent()
|
||||
m_chkFilename = CreateCheckBoxAndAddToSizer(
|
||||
sizerLeft, _T("&Filename control")
|
||||
);
|
||||
m_chkFilename->Disable(); // not implemented yet
|
||||
sizerLeft->AddSpacer(5);
|
||||
|
||||
static const wxString wrap[] =
|
||||
@@ -641,8 +642,6 @@ void TextWidgetsPage::CreateText()
|
||||
flags |= wxTE_PASSWORD;
|
||||
if ( m_chkReadonly->GetValue() )
|
||||
flags |= wxTE_READONLY;
|
||||
if ( m_chkFilename->GetValue() )
|
||||
flags |= wxTE_FILENAME;
|
||||
|
||||
switch ( m_radioWrap->GetSelection() )
|
||||
{
|
||||
@@ -701,6 +700,11 @@ void TextWidgetsPage::CreateText()
|
||||
|
||||
m_text = new WidgetsTextCtrl(this, TextPage_Textctrl, valueOld, flags);
|
||||
|
||||
#if 0
|
||||
if ( m_chkFilename->GetValue() )
|
||||
;
|
||||
#endif // TODO
|
||||
|
||||
// cast to int needed to silence gcc warning about different enums
|
||||
m_sizerText->Add(m_text, 1, wxALL |
|
||||
(flags & wxTE_MULTILINE ? (int)wxGROW
|
||||
|
Reference in New Issue
Block a user