Tidying

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

diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h
index 72c6170bc2aeb215c72a2311ee27e5d87bd8c4c0..e746c8f863cf893f27b81a4af83e5157b2fcd750 100644 (file)
--- a/include/wx/vlbox.h
+++ b/include/wx/vlbox.h
@@ -202,7 +202,7 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:
-       virtual wxBorder GetDefaultBorder() const { return GetDefaultBorderForControl(); }
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_THEME; }
 
     // the derived class must implement this function to actually draw the item
     // with the given index on the provided DC

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index f0d866b275270dfe0117375824a0399d5ac20531..7ead3406432e0455b5957c542cb024e29c242126 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -246,8 +246,6 @@ wxSize wxControl::DoGetBestSize() const
 wxBorder wxControl::GetDefaultBorder() const
 {
     return wxControlBase::GetDefaultBorder();
-
-//  return GetDefaultBorderForControl();
 }
 
 // This is a helper for all wxControls made with UPDOWN native control.

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index c3b83772f41859620de33b87d3cd0c44184c206d..8037b29d9d8fd5dde846251f2ef89cef3744307d 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1288,28 +1288,11 @@ void wxWindowMSW::MSWUpdateStyle(long flagsOld, long exflagsOld)
 
 wxBorder wxWindowMSW::GetDefaultBorderForControl() const
 {
-    // we want to automatically give controls a sunken style (confusingly,
-    // it may not really mean sunken at all as we map it to WS_EX_CLIENTEDGE
-    // which is not sunken at all under Windows XP -- rather, just the default)
-
-#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
-    return wxBORDER_SIMPLE;
-#else
-#if wxUSE_UXTHEME
-    if (CanApplyThemeBorder())
-    {
-        wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
-        if (theme)
-            return wxBORDER_THEME;
-    }
-#endif
-    return wxBORDER_SUNKEN;
-#endif
+    return wxBORDER_THEME;
 }
 
 wxBorder wxWindowMSW::GetDefaultBorder() const
 {
-    // return GetDefaultBorderForControl();
     return wxWindowBase::GetDefaultBorder();
 }