From 983d2e14141fe848dffd97f1cb2d833a87c3c453 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 26 May 2003 22:59:24 +0000
Subject: [PATCH] More style fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/slider95.cpp | 4 +++-
 src/msw/tglbtn.cpp   | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index da71dcdfda..6c811b81e0 100644
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -98,7 +98,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
         msStyle |= SS_CENTER;
 
         WXDWORD exStyle = 0;
-        msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ;
+        long valueStyle = m_windowStyle & ~wxBORDER_MASK;
+        valueStyle |= wxBORDER_SUNKEN;
+        msStyle |= MSWGetStyle(valueStyle, & exStyle) ;
 
         m_staticValue = (WXHWND) CreateWindowEx
             (
diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp
index cac34b1ac9..b73b9aa4eb 100644
--- a/src/msw/tglbtn.cpp
+++ b/src/msw/tglbtn.cpp
@@ -73,6 +73,12 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString& name)
 {
+    // default border for this control is none
+    if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+    {
+        style |= wxBORDER_NONE;
+    }
+    
    if (!CreateBase(parent, id, pos, size, style, validator, name))
       return FALSE;