From 854492623833a7070a435c3632cf156de952182c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 18 Jun 2010 09:05:26 +0000 Subject: [PATCH] Install headers in ribbon subdirectory. Add RICHTEXT_HDR to ALL_GUI_HDR variable in files.bkl to ensure that they're installed as part of "make install". Closes #12158. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 9 +++++++++ build/bakefiles/files.bkl | 2 +- build/msw/wx_core.dsp | 36 ++++++++++++++++++++++++++++++++++++ build/msw/wx_vc7_core.vcproj | 27 +++++++++++++++++++++++++++ build/msw/wx_vc8_core.vcproj | 36 ++++++++++++++++++++++++++++++++++++ build/msw/wx_vc9_core.vcproj | 36 ++++++++++++++++++++++++++++++++++++ 6 files changed, 145 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 8f5e004d6c..f8bab19a92 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4095,6 +4095,15 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/propgrid/propgridiface.h \ wx/propgrid/propgridpagestate.h \ wx/propgrid/props.h \ + wx/ribbon/art.h \ + wx/ribbon/art_internal.h \ + wx/ribbon/bar.h \ + wx/ribbon/buttonbar.h \ + wx/ribbon/control.h \ + wx/ribbon/gallery.h \ + wx/ribbon/page.h \ + wx/ribbon/panel.h \ + wx/ribbon/toolbar.h \ wx/richtext/richtextctrl.h \ wx/richtext/richtextbuffer.h \ wx/richtext/richtexthtml.h \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index b118663962..1cf7f6bac0 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -3870,7 +3870,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(GUI_CORE_HEADERS) $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR) $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR) - $(RICHTEXT_HDR) $(STC_HDR) + $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 373752784b..53f73832a4 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -5762,6 +5762,14 @@ SOURCE=..\..\include\wx\animdecod.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\art.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\ribbon\art_internal.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\artprov.h # End Source File # Begin Source File @@ -5778,6 +5786,10 @@ SOURCE=..\..\include\wx\aui\auibook.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\bar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\bitmap.h # End Source File # Begin Source File @@ -5810,6 +5822,10 @@ SOURCE=..\..\include\wx\button.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\buttonbar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\cairo.h # End Source File # Begin Source File @@ -5882,6 +5898,10 @@ SOURCE=..\..\include\wx\control.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\control.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\cshelp.h # End Source File # Begin Source File @@ -6078,6 +6098,10 @@ SOURCE=..\..\include\wx\aui\framemanager.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\gallery.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\gauge.h # End Source File # Begin Source File @@ -6306,6 +6330,10 @@ SOURCE=..\..\include\wx\ownerdrw.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\page.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\palette.h # End Source File # Begin Source File @@ -6314,6 +6342,10 @@ SOURCE=..\..\include\wx\panel.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\panel.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\paper.h # End Source File # Begin Source File @@ -6566,6 +6598,10 @@ SOURCE=..\..\include\wx\tipwin.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\toolbar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\toolbar.h # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 54f8b70874..dcfbad1b92 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -4927,6 +4927,12 @@ + + + + @@ -4939,6 +4945,9 @@ + + @@ -4963,6 +4972,9 @@ + + @@ -5017,6 +5029,9 @@ + + @@ -5164,6 +5179,9 @@ + + @@ -5335,12 +5353,18 @@ + + + + @@ -5530,6 +5554,9 @@ + + diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index eab882b2da..36f7dec21c 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -6587,6 +6587,14 @@ RelativePath="..\..\include\wx\animdecod.h" > + + + + @@ -6603,6 +6611,10 @@ RelativePath="..\..\include\wx\aui\auibook.h" > + + @@ -6635,6 +6647,10 @@ RelativePath="..\..\include\wx\button.h" > + + @@ -6707,6 +6723,10 @@ RelativePath="..\..\include\wx\control.h" > + + @@ -6903,6 +6923,10 @@ RelativePath="..\..\include\wx\aui\framemanager.h" > + + @@ -7131,6 +7155,10 @@ RelativePath="..\..\include\wx\ownerdrw.h" > + + @@ -7139,6 +7167,10 @@ RelativePath="..\..\include\wx\panel.h" > + + @@ -7391,6 +7423,10 @@ RelativePath="..\..\include\wx\tipwin.h" > + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 6728a3e828..ce7dc6fea7 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -6583,6 +6583,14 @@ RelativePath="..\..\include\wx\animdecod.h" > + + + + @@ -6599,6 +6607,10 @@ RelativePath="..\..\include\wx\aui\auibook.h" > + + @@ -6631,6 +6643,10 @@ RelativePath="..\..\include\wx\button.h" > + + @@ -6703,6 +6719,10 @@ RelativePath="..\..\include\wx\control.h" > + + @@ -6899,6 +6919,10 @@ RelativePath="..\..\include\wx\aui\framemanager.h" > + + @@ -7127,6 +7151,10 @@ RelativePath="..\..\include\wx\ownerdrw.h" > + + @@ -7135,6 +7163,10 @@ RelativePath="..\..\include\wx\panel.h" > + + @@ -7387,6 +7419,10 @@ RelativePath="..\..\include\wx\tipwin.h" > + + -- 2.45.2