X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b1d8f3611c9a00d6936e617725416339681a23f..009a066588622dd8d07343756b3e0922d2c9ebd4:/samples/widgets/textctrl.cpp diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp index 85b49793ed..9fc4ead7eb 100644 --- a/samples/widgets/textctrl.cpp +++ b/samples/widgets/textctrl.cpp @@ -41,7 +41,6 @@ #include "widgets.h" -#if 1 #include "icons/text.xpm" // ---------------------------------------------------------------------------- @@ -555,8 +554,10 @@ void TextWidgetsPage::CreateText() valueOld, wxDefaultPosition, wxDefaultSize, flags); + + // cast to int needed to silence gcc warning about different enums m_sizerText->Add(m_text, 1, wxALL | - (flags & wxTE_MULTILINE ? wxGROW + (flags & wxTE_MULTILINE ? (int)wxGROW : wxALIGN_TOP), 5); m_sizerText->Layout(); } @@ -757,4 +758,4 @@ void TextWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event) { CreateText(); } -#endif +