From 6e537cd2e250b8c58cbbd4996493ef79081a186a 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/branches/WX_2_4_BRANCH@20743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/slider95.cpp | 10 ++++++----
 src/msw/tglbtn.cpp   |  6 ++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 4c0b189c18..10266f727f 100644
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -72,9 +72,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
     SetBackgroundColour(parent->GetBackgroundColour()) ;
     SetForegroundColour(parent->GetForegroundColour()) ;
 
-    m_staticValue = (WXHWND) NULL;;
-    m_staticMin = (WXHWND) NULL;;
-    m_staticMax = (WXHWND) NULL;;
+    m_staticValue = (WXHWND) NULL;
+    m_staticMin = (WXHWND) NULL;
+    m_staticMax = (WXHWND) NULL;
     m_pageSize = 1;
     m_lineSize = 1;
     m_windowStyle = style;
@@ -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 fd31e2c3cd..dd9fe0f0bf 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;