Rationalised style handling in tree control

No longer use WS_EX_WINDOWEDGE since it seems to be obsolete,
and has no effect

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

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 438e0129a8b07853917bafd33fc0ee38ed0ffb31..a579355d50ef29c2753264b5a3c6278e397507cb 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -601,14 +601,15 @@ bool wxTreeCtrl::Create(wxWindow *parent,
 {
     Init();
 
 {
     Init();
 

+    if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+        style |= wxBORDER_SUNKEN;
+

     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 

-    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
-                   TVS_SHOWSELALWAYS;
-
-    if ( m_windowStyle & wxCLIP_SIBLINGS )
-        wstyle |= WS_CLIPSIBLINGS;
+    DWORD exStyle = 0;
+    DWORD wstyle = MSWGetStyle(m_windowStyle, & exStyle);
+    wstyle |= WS_TABSTOP | TVS_SHOWSELALWAYS;

 
     if ((m_windowStyle & wxTR_NO_LINES) == 0)
         wstyle |= TVS_HASLINES;
 
     if ((m_windowStyle & wxTR_NO_LINES) == 0)
         wstyle |= TVS_HASLINES;

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index babca8cf0052695c558aa5cec03516a3d27d7c72..d670308a9f3e017e7980a299f86ea4c493911e96 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1067,7 +1067,7 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
                 break;
 
             case wxBORDER_RAISED:
                 break;
 
             case wxBORDER_RAISED:

-                *exstyle |= WS_EX_WINDOWEDGE;
+                *exstyle |= WS_EX_DLGMODALFRAME;

                 break;
 
             case wxBORDER_SUNKEN:
                 break;
 
             case wxBORDER_SUNKEN: