From b32890072ccba0fa4aada43ba46fd63635a6f4c1 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Wed, 11 Feb 2015 22:29:47 +0000
Subject: [PATCH] Small theme tweaks

---
 source/bridges-plugin/CarlaBridgePlugin.cpp |  2 ++
 source/theme/CarlaStyle.cpp                 | 12 +++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/bridges-plugin/CarlaBridgePlugin.cpp b/source/bridges-plugin/CarlaBridgePlugin.cpp
index b67ba55d2..c063d00dd 100644
--- a/source/bridges-plugin/CarlaBridgePlugin.cpp
+++ b/source/bridges-plugin/CarlaBridgePlugin.cpp
@@ -296,6 +296,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
+#if defined(CARLA_OS_WIN) && ! defined(BUILDING_CARLA_FOR_WINDOWS)
     // ---------------------------------------------------------------------
     // Test if bridge is working
 
@@ -304,6 +305,7 @@ int main(int argc, char* argv[])
         carla_stderr("A JACK or Wine library is missing, cannot continue");
         return 1;
     }
+#endif
 
     // ---------------------------------------------------------------------
     // Get args
diff --git a/source/theme/CarlaStyle.cpp b/source/theme/CarlaStyle.cpp
index 1e14c7dd1..0b952cbd0 100644
--- a/source/theme/CarlaStyle.cpp
+++ b/source/theme/CarlaStyle.cpp
@@ -1875,6 +1875,8 @@ void CarlaStyle::drawControl(ControlElement element, const QStyleOption *option,
                             if (checked)
                                 box.state |= State_On;
                             proxy()->drawPrimitive(PE_IndicatorCheckBox, &box, painter, widget);
+                            painter->setPen(QPen(highlight, 0));
+                            painter->drawRect(checkRect);
                         }
                     }
                 }
@@ -3748,7 +3750,6 @@ int CarlaStyle::styleHint(StyleHint hint, const QStyleOption* option, const QWid
     case SH_ComboBox_ListMouseTracking:
     case SH_ScrollBar_StopMouseOverSlider:
     case SH_ScrollBar_MiddleClickAbsolutePosition:
-    case SH_EtchDisabledText:
     case SH_TitleBar_AutoRaise:
     case SH_TitleBar_NoBorder:
     case SH_ItemView_ShowDecorationSelected:
@@ -3758,20 +3759,17 @@ int CarlaStyle::styleHint(StyleHint hint, const QStyleOption* option, const QWid
     case SH_Menu_MouseTracking:
         return 1;
 
+    case SH_ComboBox_Popup:
+    case SH_EtchDisabledText:
     case SH_ToolBox_SelectedPageTitleBold:
     case SH_ScrollView_FrameOnlyAroundContents:
     case SH_Menu_AllowActiveAndDisabled:
     case SH_MainWindow_SpaceBelowMenuBar:
-    case SH_DialogButtonBox_ButtonsHaveIcons:
+    //case SH_DialogButtonBox_ButtonsHaveIcons:
     case SH_MessageBox_CenterButtons:
     case SH_RubberBand_Mask:
         return 0;
 
-    case SH_ComboBox_Popup:
-        if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox*>(option))
-            return !cmb->editable;
-        return 0;
-
     case SH_Table_GridLineColor:
         return option ? option->palette.background().color().darker(120).rgb() : 0;