Fix handling of help buttons with non-empty label under OS X.

[wxWidgets.git] / samples / ribbon / ribbondemo.cpp

diff --git a/samples/ribbon/ribbondemo.cpp b/samples/ribbon/ribbondemo.cpp
index 05bbdc4d1d577e920600502855dd7a2eb53c0c33..aac6468f4a38486c0d1b8ff1240a22f208ba4d11 100644 (file)
--- a/samples/ribbon/ribbondemo.cpp
+++ b/samples/ribbon/ribbondemo.cpp
@@ -641,8 +641,10 @@ wxRibbonGalleryItem* MyFrame::AddColourToGallery(wxRibbonGallery *gallery,
                                  wxColour* value)
 {
     wxRibbonGalleryItem* item = NULL;
-    wxColour c(colour);
-    if(value != NULL)
+    wxColour c;
+    if (colour != wxT("Default"))
+        c = wxColour(colour);
+    if (!c.IsOk())
         c = *value;
     if(c.IsOk())
     {