From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 22 Aug 2002 23:25:42 +0000 (+0000)
Subject: blind fix for gcc warning about ?: and different enums
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/72383a729f0b68e6527f9652d87fa98b20379724?ds=inline

blind fix for gcc warning about ?: and different enums


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

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
+