From 3a01bb1bce4aedbbdb6b705b0fababd01b918cb0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 22 Feb 2002 00:48:52 +0000
Subject: [PATCH] misc fixes for (absense of) the borders

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/statline.cpp | 4 ++++
 src/msw/textctrl.cpp | 6 ++++++
 src/msw/window.cpp   | 5 +++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 7535fee4c4..088e4e2d39 100644
--- a/src/msw/statline.cpp
+++ b/src/msw/statline.cpp
@@ -69,6 +69,10 @@ bool wxStaticLine::Create(wxWindow *parent,
 
 WXDWORD wxStaticLine::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
+    // we never have border
+    style &= ~wxBORDER_MASK;
+    style |= wxBORDER_NONE;
+
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 
     // add our default styles
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 4ecf1d2019..12716ffeb5 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -357,6 +357,12 @@ void wxTextCtrl::AdoptAttributesFromHWND()
 
 WXDWORD wxTextCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
+    // default border for the text controls is the sunken one
+    if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+    {
+        style |= wxBORDER_SUNKEN;
+    }
+
     long msStyle = wxControl::MSWGetStyle(style, exstyle);
 
     // default styles
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 175a806090..23d1786d2b 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1084,7 +1084,8 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
     if ( flags & wxCLIP_SIBLINGS )
         style |= WS_CLIPSIBLINGS;
 
-    if ( (flags & wxBORDER_MASK) != wxBORDER_NONE )
+    wxBorder border = (wxBorder)(flags & wxBORDER_MASK);
+    if ( border != wxBORDER_NONE && border != wxBORDER_DEFAULT )
         style |= WS_BORDER;
 
     // now deal with ext style if the caller wants it
@@ -1103,6 +1104,7 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 
             case wxBORDER_NONE:
             case wxBORDER_SIMPLE:
+            case wxBORDER_DEFAULT:
                 break;
 
             case wxBORDER_STATIC:
@@ -1113,7 +1115,6 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
                 *exstyle |= WS_EX_WINDOWEDGE;
                 break;
 
-            case wxBORDER_DEFAULT:
             case wxBORDER_SUNKEN:
                 *exstyle |= WS_EX_CLIENTEDGE;
                 break;