[Libreoffice-commits] .: 2 commits - setup_native/source vcl/source vcl/unx

[Caolán McNamara]

 setup_native/source/win32/wintools/makecab/makefile.mk |    5 ++---
 setup_native/source/win32/wintools/msidb/makefile.mk   |    4 ++--
 setup_native/source/win32/wintools/msiinfo/makefile.mk |    5 ++---
 setup_native/source/win32/wintools/msimsp/makefile.mk  |    5 ++---
 setup_native/source/win32/wintools/msitran/makefile.mk |    5 ++---
 vcl/source/app/settings.cxx                            |    2 ++
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx               |    1 +
 7 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 5b9948108d5d552ce173441686d8719f10e81613
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 25 13:13:49 2012 +0100

    get rid of dmake warning
    
    Change-Id: Ie10a8d53357255f4f326f399b59a3d81ebc7d2a6
    dmake:  Error executing ´o´: No such file or directory (Ignored)

diff --git a/setup_native/source/win32/wintools/makecab/makefile.mk b/setup_native/source/win32/wintools/makecab/makefile.mk
index c7f277b..63604c3 100644
--- a/setup_native/source/win32/wintools/makecab/makefile.mk
+++ b/setup_native/source/win32/wintools/makecab/makefile.mk
@@ -20,8 +20,7 @@ TARGET=sn_makecab
 .IF "$(WINEGCC)"==""
 @all:
     @echo "No winegcc present, not building makecab..."
-.ENDIF
-
+.ELSE
 @all: $(BIN)/makecab.exe $(BIN)/makecab.exe.so
 
 $(BIN)/makecab.exe.so: $(BIN)/makecab.exe
@@ -33,4 +32,4 @@ $(BIN)/makecab.exe:
 
 .INCLUDE : target.mk
 
-# -------------------------------------------------------------------------
+.ENDIF
diff --git a/setup_native/source/win32/wintools/msidb/makefile.mk b/setup_native/source/win32/wintools/msidb/makefile.mk
index 96c100f..849f615 100644
--- a/setup_native/source/win32/wintools/msidb/makefile.mk
+++ b/setup_native/source/win32/wintools/msidb/makefile.mk
@@ -20,8 +20,7 @@ TARGET=sn_msidb
 .IF "$(WINEGCC)"==""
 @all:
     @echo "No winegcc present, not building msidb..."
-.ENDIF
-
+.ELSE
 @all: $(BIN)/msidb.exe $(BIN)/msidb.exe.so
 
 $(BIN)/msidb.exe.so: $(BIN)/msidb.exe
@@ -34,3 +33,4 @@ $(BIN)/msidb.exe:
 .INCLUDE : target.mk
 
 # -------------------------------------------------------------------------
+.ENDIF
diff --git a/setup_native/source/win32/wintools/msiinfo/makefile.mk b/setup_native/source/win32/wintools/msiinfo/makefile.mk
index 8faf933..58d986e 100644
--- a/setup_native/source/win32/wintools/msiinfo/makefile.mk
+++ b/setup_native/source/win32/wintools/msiinfo/makefile.mk
@@ -20,8 +20,7 @@ TARGET=sn_msiinfo
 .IF "$(WINEGCC)"==""
 @all:
     @echo "No winegcc present, not building msiinfo..."
-.ENDIF
-
+.ELSE
 @all: $(BIN)/msiinfo.exe $(BIN)/msiinfo.exe.so
 
 $(BIN)/msiinfo.exe.so: $(BIN)/msiinfo.exe
@@ -33,4 +32,4 @@ $(BIN)/msiinfo.exe:
 
 .INCLUDE : target.mk
 
-# -------------------------------------------------------------------------
+.ENDIF
diff --git a/setup_native/source/win32/wintools/msimsp/makefile.mk b/setup_native/source/win32/wintools/msimsp/makefile.mk
index 8ecb5fc..0aabdf3 100644
--- a/setup_native/source/win32/wintools/msimsp/makefile.mk
+++ b/setup_native/source/win32/wintools/msimsp/makefile.mk
@@ -20,8 +20,7 @@ TARGET=sn_msimsp
 .IF "$(WINEGCC)"==""
 @all:
     @echo "No winegcc present, not building msimsp..."
-.ENDIF
-
+.ELSE
 @all: $(BIN)/msimsp.exe $(BIN)/msimsp.exe.so
 
 $(BIN)/msimsp.exe.so: $(BIN)/msimsp.exe
@@ -33,4 +32,4 @@ $(BIN)/msimsp.exe:
 
 .INCLUDE : target.mk
 
-# -------------------------------------------------------------------------
+.ENDIF
diff --git a/setup_native/source/win32/wintools/msitran/makefile.mk b/setup_native/source/win32/wintools/msitran/makefile.mk
index 910f8c5..f5a1dd4 100644
--- a/setup_native/source/win32/wintools/msitran/makefile.mk
+++ b/setup_native/source/win32/wintools/msitran/makefile.mk
@@ -20,8 +20,7 @@ TARGET=sn_msitran
 .IF "$(WINEGCC)"==""
 @all:
     @echo "No winegcc present, not building msitran..."
-.ENDIF
-
+.ELSE
 @all: $(BIN)/msitran.exe $(BIN)/msitran.exe.so
 
 $(BIN)/msitran.exe.so: $(BIN)/msitran.exe
@@ -33,4 +32,4 @@ $(BIN)/msitran.exe:
 
 .INCLUDE : target.mk
 
-# -------------------------------------------------------------------------
+.ENDIF
commit 94932d121390c8a0e8d7cac7997a14ad49bb8676
Author: Ruslan Kabatsayev <b7.10110111 at gmail.com>
Date:   Tue Jul 17 18:18:35 2012 +0400

    Make default dark shadow non-black
    
    Change-Id: If517926b12633a96ad8088e007cfcd6d84e5c919

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 9684e38..aa6064f 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -474,8 +474,10 @@ void StyleSettings::Set3DColors( const Color& rColor )
     {
         mpData->maLightColor    = rColor;
         mpData->maShadowColor   = rColor;
+        mpData->maDarkShadowColor=rColor;
         mpData->maLightColor.IncreaseLuminance( 64 );
         mpData->maShadowColor.DecreaseLuminance( 64 );
+        mpData->maDarkShadowColor.DecreaseLuminance( 100 );
         sal_uLong   nRed    = mpData->maLightColor.GetRed();
         sal_uLong   nGreen  = mpData->maLightColor.GetGreen();
         sal_uLong   nBlue   = mpData->maLightColor.GetBlue();
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index c9b1c30..2f2158a 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3805,6 +3805,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     std::fprintf( stderr, "MenuBarTextColor = %x (%d)\n", (int)aStyleSet.GetMenuBarTextColor().GetColor(), aStyleSet.GetMenuBarTextColor().GetLuminance() );
     std::fprintf( stderr, "LightColor = %x (%d)\n", (int)aStyleSet.GetLightColor().GetColor(), aStyleSet.GetLightColor().GetLuminance() );
     std::fprintf( stderr, "ShadowColor = %x (%d)\n", (int)aStyleSet.GetShadowColor().GetColor(), aStyleSet.GetShadowColor().GetLuminance() );
+    std::fprintf( stderr, "DarkShadowColor = %x (%d)\n", (int)aStyleSet.GetDarkShadowColor().GetColor(), aStyleSet.GetDarkShadowColor().GetLuminance() );
 #endif
 
     // Awful hack for menu separators in the Sonar and similar themes.