From: Václav Slavík Date: Thu, 21 Mar 2002 23:39:57 +0000 (+0000) Subject: added wxArtProvider X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f435c1f030721cd3ab023ae346f895924c29c8e8 added wxArtProvider git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index b92fbd87b9..b336c084b4 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -120,6 +120,8 @@ treelay.cpp Generic wizard.cpp Generic appcmn.cpp Common Base +artprov.cpp Common +artstd.cpp Common bmpbase.cpp Common NotGTK,NotOS2,NotMSW,NotX,NotMicro choiccmn.cpp Common clipcmn.cpp Common @@ -745,6 +747,7 @@ arrimpl.cpp WXH Base listimpl.cpp WXH Base accel.h WXH app.h WXH Base +artprov.h WXH bitmap.h WXH bmpbuttn.h WXH brush.h WXH diff --git a/src/gtk/files.lst b/src/gtk/files.lst index 5041d37893..6431a7cc7b 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -50,6 +50,8 @@ ALL_SOURCES = \ generic/treelay.cpp \ generic/wizard.cpp \ common/appcmn.cpp \ + common/artprov.cpp \ + common/artstd.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ common/clntdata.cpp \ @@ -269,6 +271,7 @@ ALL_HEADERS = \ accel.h \ app.h \ arrimpl.cpp \ + artprov.h \ bitmap.h \ bmpbuttn.h \ brush.h \ @@ -624,6 +627,8 @@ ALL_HEADERS = \ COMMONOBJS = \ parser.o \ appcmn.o \ + artprov.o \ + artstd.o \ choiccmn.o \ clipcmn.o \ clntdata.o \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index 5041d37893..6431a7cc7b 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -50,6 +50,8 @@ ALL_SOURCES = \ generic/treelay.cpp \ generic/wizard.cpp \ common/appcmn.cpp \ + common/artprov.cpp \ + common/artstd.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ common/clntdata.cpp \ @@ -269,6 +271,7 @@ ALL_HEADERS = \ accel.h \ app.h \ arrimpl.cpp \ + artprov.h \ bitmap.h \ bmpbuttn.h \ brush.h \ @@ -624,6 +627,8 @@ ALL_HEADERS = \ COMMONOBJS = \ parser.o \ appcmn.o \ + artprov.o \ + artstd.o \ choiccmn.o \ clipcmn.o \ clntdata.o \ diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index a48ad5c3ae..076addc04d 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -50,32 +50,7 @@ #include "wx/fontenum.h" #include "wx/stream.h" #include "wx/filedlg.h" - -// Bitmaps: - -#ifndef __WXMSW__ - // XPM hack: make the arrays const - #define static static const - - #include "bitmaps/wpanel.xpm" - #include "bitmaps/wback.xpm" - #include "bitmaps/wforward.xpm" - #include "bitmaps/wbook.xpm" - #include "bitmaps/woptions.xpm" - #include "bitmaps/wfolder.xpm" - #include "bitmaps/wpage.xpm" - #include "bitmaps/whelp.xpm" - #include "bitmaps/whlproot.xpm" - #include "bitmaps/wbkadd.xpm" - #include "bitmaps/wbkdel.xpm" - #include "bitmaps/wup.xpm" - #include "bitmaps/wupnode.xpm" - #include "bitmaps/wdown.xpm" - #include "bitmaps/wopen.xpm" - #include "bitmaps/wprint.xpm" - - #undef static -#endif // __WXMSW__ +#include "wx/artprov.h" // what is considered "small index"? #define INDEX_IS_SMALL 100 @@ -253,10 +228,9 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, m_hfStyle = style; wxImageList *ContentsImageList = new wxImageList(16, 16); - ContentsImageList->Add(wxICON(wbook)); - ContentsImageList->Add(wxICON(wfolder)); - ContentsImageList->Add(wxICON(wpage)); - ContentsImageList->Add(wxICON(whlproot)); + ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_BOOK, wxART_HELP_BROWSER)); + ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_FOLDER, wxART_HELP_BROWSER)); + ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_PAGE, wxART_HELP_BROWSER)); // Do the config in two steps. We read the HtmlWindow customization after we // create the window. @@ -269,7 +243,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, GetPosition(&m_Cfg.x, &m_Cfg.y); - SetIcon(wxICON(whelp)); + SetIcon(wxArtProvider::GetIcon(wxART_FRAME_ICON, wxART_HELP_BROWSER)); int notebook_page = 0; @@ -340,11 +314,11 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, wxBitmapButton *bmpbt1, *bmpbt2; bmpbt1 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSADD, - wxBITMAP(wbkadd), - wxDefaultPosition, wxSize(20,20)); + wxArtProvider::GetBitmap(wxART_ADD_BOOKMARK, + wxART_HELP_BROWSER)); bmpbt2 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSREMOVE, - wxBITMAP(wbkdel), - wxDefaultPosition, wxSize(20,20)); + wxArtProvider::GetBitmap(wxART_DEL_BOOKMARK, + wxART_HELP_BROWSER)); #if wxUSE_TOOLTIPS bmpbt1->SetToolTip(_("Add current page to bookmarks")); bmpbt2->SetToolTip(_("Remove current page from bookmarks")); @@ -352,9 +326,9 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL); - sizer->Add(m_Bookmarks, 1, wxRIGHT, 5); - sizer->Add(bmpbt1, 0, wxRIGHT, 2); - sizer->Add(bmpbt2, 0, 0, 0); + sizer->Add(m_Bookmarks, 1, wxALIGN_CENTRE_VERTICAL | wxRIGHT, 5); + sizer->Add(bmpbt1, 0, wxALIGN_CENTRE_VERTICAL | wxRIGHT, 2); + sizer->Add(bmpbt2, 0, wxALIGN_CENTRE_VERTICAL, 0); topsizer->Add(sizer, 0, wxEXPAND | wxLEFT | wxBOTTOM | wxRIGHT, 10); } @@ -495,15 +469,24 @@ wxHtmlHelpFrame::~wxHtmlHelpFrame() void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style) { - wxBitmap wpanelBitmap = wxBITMAP(wpanel); - wxBitmap wbackBitmap = wxBITMAP(wback); - wxBitmap wforwardBitmap = wxBITMAP(wforward); - wxBitmap wupnodeBitmap = wxBITMAP(wupnode); - wxBitmap wupBitmap = wxBITMAP(wup); - wxBitmap wdownBitmap = wxBITMAP(wdown); - wxBitmap wopenBitmap = wxBITMAP(wopen); - wxBitmap wprintBitmap = wxBITMAP(wprint); - wxBitmap woptionsBitmap = wxBITMAP(woptions); + wxBitmap wpanelBitmap = + wxArtProvider::GetBitmap(wxART_HELP_SIDE_PANEL, wxART_HELP_BROWSER); + wxBitmap wbackBitmap = + wxArtProvider::GetBitmap(wxART_GO_BACK, wxART_HELP_BROWSER); + wxBitmap wforwardBitmap = + wxArtProvider::GetBitmap(wxART_GO_FORWARD, wxART_HELP_BROWSER); + wxBitmap wupnodeBitmap = + wxArtProvider::GetBitmap(wxART_GO_TO_PARENT, wxART_HELP_BROWSER); + wxBitmap wupBitmap = + wxArtProvider::GetBitmap(wxART_GO_UP, wxART_HELP_BROWSER); + wxBitmap wdownBitmap = + wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_HELP_BROWSER); + wxBitmap wopenBitmap = + wxArtProvider::GetBitmap(wxART_FILE_OPEN, wxART_HELP_BROWSER); + wxBitmap wprintBitmap = + wxArtProvider::GetBitmap(wxART_PRINT, wxART_HELP_BROWSER); + wxBitmap woptionsBitmap = + wxArtProvider::GetBitmap(wxART_HELP_SETTINGS, wxART_HELP_BROWSER); wxASSERT_MSG( (wpanelBitmap.Ok() && wbackBitmap.Ok() && wforwardBitmap.Ok() && wupnodeBitmap.Ok() && @@ -724,8 +707,6 @@ void wxHtmlHelpFrame::CreateContents() m_ContentsBox->DeleteAllItems(); roots[0] = m_ContentsBox->AddRoot(_("(Help)")); - m_ContentsBox->SetItemImage(roots[0], IMG_RootFolder); - m_ContentsBox->SetItemSelectedImage(roots[0], IMG_RootFolder); imaged[0] = TRUE; for (it = m_Data->GetContents(), i = 0; i < cnt; i++, it++) diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst index 850200304a..5389101eda 100644 --- a/src/mac/carbon/files.lst +++ b/src/mac/carbon/files.lst @@ -47,6 +47,8 @@ ALL_SOURCES = \ generic/treelay.cpp \ generic/wizard.cpp \ common/appcmn.cpp \ + common/artprov.cpp \ + common/artstd.cpp \ common/bmpbase.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ @@ -276,6 +278,7 @@ ALL_HEADERS = \ accel.h \ app.h \ arrimpl.cpp \ + artprov.h \ bitmap.h \ bmpbuttn.h \ brush.h \ @@ -651,6 +654,8 @@ ALL_HEADERS = \ COMMONOBJS = \ parser.o \ appcmn.o \ + artprov.o \ + artstd.o \ bmpbase.o \ choiccmn.o \ clipcmn.o \ diff --git a/src/mac/files.lst b/src/mac/files.lst index 850200304a..5389101eda 100644 --- a/src/mac/files.lst +++ b/src/mac/files.lst @@ -47,6 +47,8 @@ ALL_SOURCES = \ generic/treelay.cpp \ generic/wizard.cpp \ common/appcmn.cpp \ + common/artprov.cpp \ + common/artstd.cpp \ common/bmpbase.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ @@ -276,6 +278,7 @@ ALL_HEADERS = \ accel.h \ app.h \ arrimpl.cpp \ + artprov.h \ bitmap.h \ bmpbuttn.h \ brush.h \ @@ -651,6 +654,8 @@ ALL_HEADERS = \ COMMONOBJS = \ parser.o \ appcmn.o \ + artprov.o \ + artstd.o \ bmpbase.o \ choiccmn.o \ clipcmn.o \ diff --git a/src/mgl/files.lst b/src/mgl/files.lst index 393387d74e..8ed996e5d8 100644 --- a/src/mgl/files.lst +++ b/src/mgl/files.lst @@ -49,6 +49,8 @@ ALL_SOURCES = \ generic/treelay.cpp \ generic/wizard.cpp \ common/appcmn.cpp \ + common/artprov.cpp \ + common/artstd.cpp \ common/bmpbase.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ @@ -231,6 +233,7 @@ ALL_HEADERS = \ accel.h \ app.h \ arrimpl.cpp \ + artprov.h \ bitmap.h \ bmpbuttn.h \ brush.h \ @@ -524,6 +527,8 @@ ALL_HEADERS = \ COMMONOBJS = \ parser.o \ appcmn.o \ + artprov.o \ + artstd.o \ bmpbase.o \ choiccmn.o \ clipcmn.o \ diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat index 476204a2ec..cf53427e6c 100644 --- a/src/mgl/makefile.wat +++ b/src/mgl/makefile.wat @@ -91,6 +91,8 @@ GENERICOBJS= accel.obj & COMMONOBJS = & y_tab.obj & appcmn.obj & + artprov.obj & + artstd.obj & bmpbase.obj & choiccmn.obj & clipcmn.obj & @@ -528,6 +530,12 @@ win32.obj: $(UNIVTHEMEDIR)\win32.cpp appcmn.obj: $(COMMDIR)\appcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +artprov.obj: $(COMMDIR)\artprov.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + +artstd.obj: $(COMMDIR)\artstd.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + bmpbase.obj: $(COMMDIR)\bmpbase.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< diff --git a/src/microwin/files.lst b/src/microwin/files.lst index 8937533ec0..77f08e251b 100644 --- a/src/microwin/files.lst +++ b/src/microwin/files.lst @@ -47,6 +47,8 @@ ALL_SOURCES = \ generic/treelay.cpp \ generic/wizard.cpp \ common/appcmn.cpp \ + common/artprov.cpp \ + common/artstd.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ common/clntdata.cpp \ @@ -231,6 +233,7 @@ ALL_HEADERS = \ accel.h \ app.h \ arrimpl.cpp \ + artprov.h \ bitmap.h \ bmpbuttn.h \ brush.h \ @@ -618,6 +621,8 @@ ALL_HEADERS = \ COMMONOBJS = \ parser.o \ appcmn.o \ + artprov.o \ + artstd.o \ choiccmn.o \ clipcmn.o \ clntdata.o \ diff --git a/src/motif/files.lst b/src/motif/files.lst index 49c55b750b..46d61faa3a 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -49,6 +49,8 @@ ALL_SOURCES = \ generic/treelay.cpp \ generic/wizard.cpp \ common/appcmn.cpp \ + common/artprov.cpp \ + common/artstd.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ common/clntdata.cpp \ @@ -260,6 +262,7 @@ ALL_HEADERS = \ accel.h \ app.h \ arrimpl.cpp \ + artprov.h \ bitmap.h \ bmpbuttn.h \ brush.h \ @@ -612,6 +615,8 @@ ALL_HEADERS = \ COMMONOBJS = \ parser.o \ appcmn.o \ + artprov.o \ + artstd.o \ choiccmn.o \ clipcmn.o \ clntdata.o \ diff --git a/src/msw/files.lst b/src/msw/files.lst index 39c621fa9e..2048f454a6 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -33,6 +33,8 @@ ALL_SOURCES = \ generic/treelay.cpp \ generic/wizard.cpp \ common/appcmn.cpp \ + common/artprov.cpp \ + common/artstd.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ common/clntdata.cpp \ @@ -290,6 +292,7 @@ ALL_HEADERS = \ accel.h \ app.h \ arrimpl.cpp \ + artprov.h \ bitmap.h \ bmpbuttn.h \ brush.h \ @@ -685,6 +688,8 @@ ALL_HEADERS = \ COMMONOBJS = \ parser.o \ appcmn.o \ + artprov.o \ + artstd.o \ choiccmn.o \ clipcmn.o \ clntdata.o \ diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 11dfa7440c..6dae7028c8 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -116,6 +116,8 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ COMMONOBJS = \ $(MSWDIR)\y_tab.obj \ $(MSWDIR)\appcmn.obj \ + $(MSWDIR)\artprov.obj \ + $(MSWDIR)\artstd.obj \ $(MSWDIR)\choiccmn.obj \ $(MSWDIR)\clipcmn.obj \ $(MSWDIR)\clntdata.obj \ @@ -651,6 +653,10 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF) $(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF) +$(MSWDIR)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF) + +$(MSWDIR)\artstd.obj: $(COMMDIR)\artstd.$(SRCSUFF) + $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF) $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF) diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index b81044daea..e45dda7353 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -107,6 +107,8 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ COMMONOBJS = \ $(MSWDIR)\y_tab.obj \ $(MSWDIR)\appcmn.obj \ + $(MSWDIR)\artprov.obj \ + $(MSWDIR)\artstd.obj \ $(MSWDIR)\choiccmn.obj \ $(MSWDIR)\clipcmn.obj \ $(MSWDIR)\clntdata.obj \ @@ -513,6 +515,10 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF) $(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF) +$(MSWDIR)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF) + +$(MSWDIR)\artstd.obj: $(COMMDIR)\artstd.$(SRCSUFF) + $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF) $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 25c21a0038..5fc40b46f4 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -91,6 +91,8 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ COMMONOBJS1 = \ $(COMMDIR)\y_tab.obj \ $(COMMDIR)\appcmn.obj \ + $(COMMDIR)\artprov.obj \ + $(COMMDIR)\artstd.obj \ $(COMMDIR)\bmpbase.obj \ $(COMMDIR)\choiccmn.obj \ $(COMMDIR)\clipcmn.obj \ @@ -800,6 +802,16 @@ $(COMMDIR)/appcmn.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/artprov.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + +$(COMMDIR)/artstd.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/bmpbase.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 4b63f3a301..ca3ac9e5f2 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -183,6 +183,8 @@ COMMONOBJS_BASEONLY = \ COMMONOBJS = \ $(COMMONOBJS_BASE) \ $(COMMDIR)/y_tab.$(OBJSUFF) \ + $(COMMDIR)/artprov.$(OBJSUFF) \ + $(COMMDIR)/artstd.$(OBJSUFF) \ $(COMMDIR)/choiccmn.$(OBJSUFF) \ $(COMMDIR)/clipcmn.$(OBJSUFF) \ $(COMMDIR)/cmdproc.$(OBJSUFF) \ diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index d888a7abc5..19dc30fb14 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -60,6 +60,8 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ COMMONOBJS = \ $(COMMDIR)\y_tab.obj \ $(COMMDIR)\appcmn.obj \ + $(COMMDIR)\artprov.obj \ + $(COMMDIR)\artstd.obj \ $(COMMDIR)\choiccmn.obj \ $(COMMDIR)\clipcmn.obj \ $(COMMDIR)\clntdata.obj \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 700d65326d..dfc6f4a7f9 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -137,6 +137,8 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \ COMMONOBJS = \ $(COMMDIR)\$D\y_tab.obj \ $(COMMDIR)\$D\appcmn.obj \ + $(COMMDIR)\$D\artprov.obj \ + $(COMMDIR)\$D\artstd.obj \ $(COMMDIR)\$D\choiccmn.obj \ $(COMMDIR)\$D\clipcmn.obj \ $(COMMDIR)\$D\clntdata.obj \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index 8e643b2343..b1e4adf460 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -99,6 +99,8 @@ NONESSENTIALOBJS= accel.obj & COMMONOBJS = & y_tab.obj & appcmn.obj & + artprov.obj & + artstd.obj & choiccmn.obj & clipcmn.obj & clntdata.obj & @@ -737,6 +739,12 @@ window.obj: $(MSWDIR)\window.cpp appcmn.obj: $(COMMDIR)\appcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +artprov.obj: $(COMMDIR)\artprov.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + +artstd.obj: $(COMMDIR)\artstd.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + choiccmn.obj: $(COMMDIR)\choiccmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp index 3b449bf420..bd8ea64fd2 100644 --- a/src/wxUniv.dsp +++ b/src/wxUniv.dsp @@ -89,6 +89,14 @@ SOURCE=.\common\appcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\artprov.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\artstd.cpp +# End Source File +# Begin Source File + SOURCE=.\common\bmpbase.cpp # End Source File # Begin Source File @@ -1234,6 +1242,10 @@ SOURCE=..\include\wx\app.h # End Source File # Begin Source File +SOURCE=..\include\wx\artprov.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\bitmap.h # End Source File # Begin Source File diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 2c27d62c20..bfadb9b130 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -252,6 +252,14 @@ SOURCE=.\common\appcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\artprov.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\artstd.cpp +# End Source File +# Begin Source File + SOURCE=.\common\choiccmn.cpp # End Source File # Begin Source File @@ -1510,6 +1518,10 @@ SOURCE=..\include\wx\app.h # End Source File # Begin Source File +SOURCE=..\include\wx\artprov.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\bitmap.h # End Source File # Begin Source File diff --git a/src/x11/files.lst b/src/x11/files.lst index a8c137a779..cb99613800 100644 --- a/src/x11/files.lst +++ b/src/x11/files.lst @@ -80,6 +80,8 @@ ALL_SOURCES = \ generic/treelay.cpp \ generic/wizard.cpp \ common/appcmn.cpp \ + common/artprov.cpp \ + common/artstd.cpp \ common/bmpbase.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ @@ -239,6 +241,7 @@ ALL_HEADERS = \ accel.h \ app.h \ arrimpl.cpp \ + artprov.h \ bitmap.h \ bmpbuttn.h \ brush.h \ @@ -636,6 +639,8 @@ GUI_LOWLEVEL_OBJS = \ COMMONOBJS = \ parser.o \ appcmn.o \ + artprov.o \ + artstd.o \ bmpbase.o \ choiccmn.o \ clipcmn.o \