AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

blind fix for gcc warning about ?: and different enums

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-08-22 23:25:42 +00:00
parent dd4aa550ab
commit 72383a729f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
samples/widgets/textctrl.cpp
View File

@ -41,7 +41,6 @@
#include "widgets.h" #include "widgets.h"
#if 1
#include "icons/text.xpm" #include "icons/text.xpm"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -555,8 +554,10 @@ void TextWidgetsPage::CreateText()
valueOld, valueOld,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
flags); flags);
// cast to int needed to silence gcc warning about different enums
m_sizerText->Add(m_text, 1, wxALL | m_sizerText->Add(m_text, 1, wxALL |
(flags & wxTE_MULTILINE ? wxGROW (flags & wxTE_MULTILINE ? (int)wxGROW
: wxALIGN_TOP), 5); : wxALIGN_TOP), 5);
m_sizerText->Layout(); m_sizerText->Layout();
} }
@ -757,4 +758,4 @@ void TextWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
{ {
CreateText(); CreateText();
} }
#endif