misc fixes for (absense of) the borders

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 7535fee4c4d71d7c00372015379be35efa2972b9..088e4e2d39727bf66fdaa04680970276e0597cb1 100644 (file)
--- 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
 {
 
 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
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 
     // add our default styles

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 4ecf1d2019c7a751cd6305b6648fe72908457a4f..12716ffeb5165b8e13154da8b699a7e2f0b35aaa 100644 (file)
--- 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
 {
 
 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
     long msStyle = wxControl::MSWGetStyle(style, exstyle);
 
     // default styles

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 175a8060909623d5c2d21dde8f2d250a778c1e03..23d1786d2b769085ca4e6a300a86da0c3fcb9fba 100644 (file)
--- 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 & 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
         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_NONE:
             case wxBORDER_SIMPLE:

+            case wxBORDER_DEFAULT:

                 break;
 
             case wxBORDER_STATIC:
                 break;
 
             case wxBORDER_STATIC:


@@ -1113,7 +1115,6 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
                 *exstyle |= WS_EX_WINDOWEDGE;
                 break;
 
                 *exstyle |= WS_EX_WINDOWEDGE;
                 break;
 

-            case wxBORDER_DEFAULT:

             case wxBORDER_SUNKEN:
                 *exstyle |= WS_EX_CLIENTEDGE;
                 break;
             case wxBORDER_SUNKEN:
                 *exstyle |= WS_EX_CLIENTEDGE;
                 break;