diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 3b0627b903..cb1c0fcf41 100644
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -118,8 +118,12 @@ void wxControlBase::InitCommandEvent(wxCommandEvent& event) const
 
 bool wxControlBase::SetFont(const wxFont& font)
 {
+    if ( !wxWindow::SetFont(font) )
+        return false;
+
     InvalidateBestSize();
-    return wxWindow::SetFont(font);
+
+    return true;
 }
 
 // wxControl-specific processing after processing the update event