diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index a8ee1e5075..503d0db28c 100644
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -71,6 +71,9 @@ public:
     // default style for the control include WS_TABSTOP if it AcceptsFocus()
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const;
+
 protected:
     // return default best size (doesn't really make any sense, override this)
     virtual wxSize DoGetBestSize() const;
diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index ec80d8d956..92fcfd7bcd 100644
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -78,6 +78,9 @@ public:
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+
 protected:
     // common part of all ctors
     void Init();
diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 272ef5b701..857cc3325b 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -243,6 +243,11 @@ wxSize wxControl::DoGetBestSize() const
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 
+wxBorder wxControl::GetDefaultBorder() const
+{
+	return GetDefaultBorderForControl();
+}
+
 // This is a helper for all wxControls made with UPDOWN native control.
 // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
 // WinCE of Smartphones this happens also for native wxTextCtrl,
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 99bb37b398..2632c1f730 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1286,11 +1286,6 @@ void wxWindowMSW::MSWUpdateStyle(long flagsOld, long exflagsOld)
     }
 }
 
-wxBorder wxWindowMSW::GetDefaultBorder() const
-{
-	return GetDefaultBorderForControl();
-}
-
 wxBorder wxWindowMSW::GetDefaultBorderForControl() const
 {
     // we want to automatically give controls a sunken style (confusingly,
@@ -1312,6 +1307,11 @@ wxBorder wxWindowMSW::GetDefaultBorderForControl() const
 #endif
 }
 
+wxBorder wxWindowMSW::GetDefaultBorder() const
+{
+	return GetDefaultBorderForControl();
+}
+
 WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 {
     // translate common wxWidgets styles to Windows ones