diff --git a/include/wx/defs.h b/include/wx/defs.h
index c4dd777540..d98dac5354 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1352,7 +1352,7 @@ enum wxStretch
     wxGROW                    = 0x2000,
     wxEXPAND                  = wxGROW,
     wxSHAPED                  = 0x4000,
-    wxTILE                    = wxSHAPED | wxFIXED_MINSIZE,
+    wxTILE                    = 0xc000, /* wxSHAPED | wxFIXED_MINSIZE */
 
     /*  a mask to extract stretch from the combination of flags */
     wxSTRETCH_MASK            = 0x7000 /* sans wxTILE */
diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index a4af0a629c..5966cab5d9 100644
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -147,7 +147,8 @@ protected:
     wxDEPRECATED_MSG("useless and will be removed in the future")
     int GetDefaultTextCtrlFlag() const
     {
-        return wxALIGN_CENTER_VERTICAL | wxRIGHT;
+        // Cast to avoid warnings about mixing elements of different enums.
+        return wxALIGN_CENTER_VERTICAL | static_cast<int>(wxRIGHT);
     }
 #endif // WXWIN_COMPATIBILITY_3_0