Mercurial > octave-nkf

changeset 19465:bd27cd403d00 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix errors when building octave for windows (regression from d93293218966) * octave-dock-widget.cc (make_wodget): parameter dock readded since needed for windows; (set_style): declare icon_color for all cases, not only for custom styles, added missing plus sign
author Torsten <ttl@justmail.de>
date Sat, 27 Dec 2014 13:08:19 +0100
parents 472a5572849c
children 0f5670b40d94
files libgui/src/octave-dock-widget.cc
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/octave-dock-widget.cc	Fri Dec 26 09:10:38 2014 +0100
+++ b/libgui/src/octave-dock-widget.cc	Sat Dec 27 13:08:19 2014 +0100
@@ -204,7 +204,7 @@
 
 // dock the widget
 void
-octave_dock_widget::make_widget (bool)
+octave_dock_widget::make_widget (bool dock)
 {
 #if defined (Q_OS_WIN32)
 
@@ -288,6 +288,8 @@
   QString css_button;
   QString dock_icon;
 
+  QString icon_col = _icon_color;
+
   if (_floating)
     dock_icon = "widget-dock";
   else
@@ -297,7 +299,6 @@
     {
 
       QColor bg_col, fg_col;
-      QString icon_col;
 
       if (active)
         {
@@ -356,7 +357,7 @@
   _dock_button->setStyleSheet (css_button);
   _close_button->setStyleSheet (css_button);
   _dock_action->setIcon (QIcon (":/actions/icons/" + dock_icon + icon_col + ".png"));
-  _close_action->setIcon (QIcon (":/actions/icons/widget-close" + dock_icon + icon_col ".png"));
+  _close_action->setIcon (QIcon (":/actions/icons/widget-close" + dock_icon + icon_col + ".png"));
 #else
   setStyleSheet (css);
 #endif