diff --git a/Makefile.in b/Makefile.in
index 59a2986ae0..dcc662d74e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3202,6 +3202,7 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
 	wx/msw/ole/oleutils.h \
 	wx/msw/ole/safearray.h \
 	wx/msw/ownerdrw.h \
+	wx/msw/ownerdrawnbutton.h \
 	wx/msw/palette.h \
 	wx/msw/panel.h \
 	wx/msw/pen.h \
@@ -3719,6 +3720,7 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
 	wx/msw/ole/oleutils.h \
 	wx/msw/ole/safearray.h \
 	wx/msw/ownerdrw.h \
+	wx/msw/ownerdrawnbutton.h \
 	wx/msw/palette.h \
 	wx/msw/panel.h \
 	wx/msw/pen.h \
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 0ed0288e96..1f598f167c 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1887,6 +1887,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/ole/oleutils.h
     wx/msw/ole/safearray.h
     wx/msw/ownerdrw.h
+    wx/msw/ownerdrawnbutton.h
     wx/msw/palette.h
     wx/msw/panel.h
     wx/msw/pen.h
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 2247ccf3e6..437ac7c9ed 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -1752,6 +1752,10 @@ SOURCE=..\..\include\wx\msw\ole\oleutils.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\ownerdrawnbutton.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\ownerdrw.h
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_vc10_core.vcxproj b/build/msw/wx_vc10_core.vcxproj
index 672477a663..65eeb9c419 100644
--- a/build/msw/wx_vc10_core.vcxproj
+++ b/build/msw/wx_vc10_core.vcxproj
@@ -1221,6 +1221,7 @@
     <ClInclude Include="..\..\include\wx\msw\notifmsg.h" />
     <ClInclude Include="..\..\include\wx\msw\ole\oleutils.h" />
     <ClInclude Include="..\..\include\wx\msw\ownerdrw.h" />
+    <ClInclude Include="..\..\include\wx\msw\ownerdrawnbutton.h" />
     <ClInclude Include="..\..\include\wx\msw\palette.h" />
     <ClInclude Include="..\..\include\wx\msw\panel.h" />
     <ClInclude Include="..\..\include\wx\msw\pen.h" />
@@ -1497,6 +1498,7 @@
     <ClInclude Include="..\..\include\wx\odcombo.h" />
     <ClInclude Include="..\..\include\wx\overlay.h" />
     <ClInclude Include="..\..\include\wx\ownerdrw.h" />
+    <ClInclude Include="..\..\include\wx\ownerdrawnbutton.h" />
     <ClInclude Include="..\..\include\wx\ribbon\page.h" />
     <ClInclude Include="..\..\include\wx\palette.h" />
     <ClInclude Include="..\..\include\wx\panel.h" />
@@ -1685,4 +1687,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/msw/wx_vc10_core.vcxproj.filters b/build/msw/wx_vc10_core.vcxproj.filters
index a442858630..45eacb9390 100644
--- a/build/msw/wx_vc10_core.vcxproj.filters
+++ b/build/msw/wx_vc10_core.vcxproj.filters
@@ -1144,6 +1144,9 @@
     <ClInclude Include="..\..\include\wx\msw\ownerdrw.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\msw\ownerdrawnbutton.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\palette.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -1972,6 +1975,9 @@
     <ClInclude Include="..\..\include\wx\ownerdrw.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\ownerdrawnbutton.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\ribbon\page.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
diff --git a/build/msw/wx_vc11_core.vcxproj b/build/msw/wx_vc11_core.vcxproj
index 41a05dcfd3..b0edcd3342 100644
--- a/build/msw/wx_vc11_core.vcxproj
+++ b/build/msw/wx_vc11_core.vcxproj
@@ -1221,6 +1221,7 @@
     <ClInclude Include="..\..\include\wx\msw\notifmsg.h" />
     <ClInclude Include="..\..\include\wx\msw\ole\oleutils.h" />
     <ClInclude Include="..\..\include\wx\msw\ownerdrw.h" />
+    <ClInclude Include="..\..\include\wx\msw\ownerdrawnbutton.h" />
     <ClInclude Include="..\..\include\wx\msw\palette.h" />
     <ClInclude Include="..\..\include\wx\msw\panel.h" />
     <ClInclude Include="..\..\include\wx\msw\pen.h" />
@@ -1497,6 +1498,7 @@
     <ClInclude Include="..\..\include\wx\odcombo.h" />
     <ClInclude Include="..\..\include\wx\overlay.h" />
     <ClInclude Include="..\..\include\wx\ownerdrw.h" />
+    <ClInclude Include="..\..\include\wx\ownerdrawnbutton.h" />
     <ClInclude Include="..\..\include\wx\ribbon\page.h" />
     <ClInclude Include="..\..\include\wx\palette.h" />
     <ClInclude Include="..\..\include\wx\panel.h" />
@@ -1685,4 +1687,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/msw/wx_vc11_core.vcxproj.filters b/build/msw/wx_vc11_core.vcxproj.filters
index a442858630..45eacb9390 100644
--- a/build/msw/wx_vc11_core.vcxproj.filters
+++ b/build/msw/wx_vc11_core.vcxproj.filters
@@ -1144,6 +1144,9 @@
     <ClInclude Include="..\..\include\wx\msw\ownerdrw.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\msw\ownerdrawnbutton.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\palette.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -1972,6 +1975,9 @@
     <ClInclude Include="..\..\include\wx\ownerdrw.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\ownerdrawnbutton.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\ribbon\page.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
diff --git a/build/msw/wx_vc12_core.vcxproj b/build/msw/wx_vc12_core.vcxproj
index d0d162942e..c482602953 100644
--- a/build/msw/wx_vc12_core.vcxproj
+++ b/build/msw/wx_vc12_core.vcxproj
@@ -1221,6 +1221,7 @@
     <ClInclude Include="..\..\include\wx\msw\notifmsg.h" />
     <ClInclude Include="..\..\include\wx\msw\ole\oleutils.h" />
     <ClInclude Include="..\..\include\wx\msw\ownerdrw.h" />
+    <ClInclude Include="..\..\include\wx\msw\ownerdrawnbutton.h" />
     <ClInclude Include="..\..\include\wx\msw\palette.h" />
     <ClInclude Include="..\..\include\wx\msw\panel.h" />
     <ClInclude Include="..\..\include\wx\msw\pen.h" />
@@ -1497,6 +1498,7 @@
     <ClInclude Include="..\..\include\wx\odcombo.h" />
     <ClInclude Include="..\..\include\wx\overlay.h" />
     <ClInclude Include="..\..\include\wx\ownerdrw.h" />
+    <ClInclude Include="..\..\include\wx\ownerdrawnbutton.h" />
     <ClInclude Include="..\..\include\wx\ribbon\page.h" />
     <ClInclude Include="..\..\include\wx\palette.h" />
     <ClInclude Include="..\..\include\wx\panel.h" />
diff --git a/build/msw/wx_vc12_core.vcxproj.filters b/build/msw/wx_vc12_core.vcxproj.filters
index a442858630..45eacb9390 100644
--- a/build/msw/wx_vc12_core.vcxproj.filters
+++ b/build/msw/wx_vc12_core.vcxproj.filters
@@ -1144,6 +1144,9 @@
     <ClInclude Include="..\..\include\wx\msw\ownerdrw.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\msw\ownerdrawnbutton.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\palette.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -1972,6 +1975,9 @@
     <ClInclude Include="..\..\include\wx\ownerdrw.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\ownerdrawnbutton.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\ribbon\page.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 011e4f0157..cea96fc75e 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1496,6 +1496,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\ole\oleutils.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ownerdrawnbutton.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ownerdrw.h">
 			</File>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index ecdec84b92..6a90a57afa 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -2004,6 +2004,10 @@
 				RelativePath="..\..\include\wx\msw\ole\oleutils.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ownerdrawnbutton.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ownerdrw.h"
 				>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index f7891f82a6..aee0ba5f11 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -2002,6 +2002,10 @@
 				RelativePath="..\..\include\wx\msw\ole\oleutils.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ownerdrawnbutton.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ownerdrw.h"
 				>