cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxUSE_XML and wxUSE_XRC build fixes if expat is not enabled

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton 2004-09-22 21:23:46 +00:00
parent eccd56020f
commit da86e17765
41 changed files with 77 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/xrc/xh_bmpbt.h
View File

@ -17,6 +17,8 @@
#include "wx/xrc/xmlres.h"
#if wxUSE_XML && wxUSE_XRC
class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
{
@ -27,5 +29,7 @@ public:
virtual bool CanHandle(wxXmlNode *node);
};
#endif //wxUSE_XML && wxUSE_XRC
#endif // _WX_XH_BMPBT_H_

4
include/wx/xrc/xmlres.h
View File

@ -17,7 +17,7 @@
#include "wx/defs.h"
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/string.h"
#include "wx/dynarray.h"
@ -492,6 +492,6 @@ public:
#define GetXMLID GetXRCID
#endif
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC
#endif // _WX_XMLRES_H_

4
src/xrc/xh_bmp.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_bmp.h"
#include "wx/bitmap.h"
@ -58,4 +58,4 @@ bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxIcon"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_bmpbt.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_bmpbt.h"
#include <wx/bmpbuttn.h>
@ -68,4 +68,4 @@ bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxBitmapButton"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_bttn.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_bttn.h"
#include "wx/button.h"
@ -61,4 +61,4 @@ bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxButton"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_cald.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_CALENDARCTRL
#if wxUSE_XML && wxUSE_XRC && wxUSE_CALENDARCTRL
#include "wx/xrc/xh_cald.h"
#include "wx/event.h"
@ -64,4 +64,4 @@ bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxCalendarCtrl"));
}
#endif // wxUSE_XRC && wxUSE_CALENDARCTRL
#endif // wxUSE_XML && wxUSE_XRC && wxUSE_CALENDARCTRL

4
src/xrc/xh_chckb.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_CHECKBOX
#if wxUSE_XML && wxUSE_XRC && wxUSE_CHECKBOX
#include "wx/xrc/xh_chckb.h"
#include "wx/checkbox.h"
@ -59,4 +59,4 @@ bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxCheckBox"));
}
#endif // wxUSE_XRC && wxUSE_CHECKBOX
#endif // wxUSE_XML && wxUSE_XRC && wxUSE_CHECKBOX

4
src/xrc/xh_chckl.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
@ -133,4 +133,4 @@ bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
#endif // wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_choic.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_choic.h"
#include "wx/choice.h"
@ -96,4 +96,4 @@ bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
(m_insideBox && node->GetName() == wxT("item")));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_combo.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_COMBOBOX
#if wxUSE_XML && wxUSE_XRC && wxUSE_COMBOBOX
#include "wx/xrc/xh_combo.h"
#include "wx/combobox.h"
@ -100,4 +100,4 @@ bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
(m_insideBox && node->GetName() == wxT("item")));
}
#endif // wxUSE_XRC && wxUSE_COMBOBOX
#endif // wxUSE_XML && wxUSE_XRC && wxUSE_COMBOBOX

4
src/xrc/xh_dlg.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_dlg.h"
#include "wx/dialog.h"
@ -82,4 +82,4 @@ bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxDialog"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_frame.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_frame.h"
#include "wx/frame.h"
@ -87,4 +87,4 @@ bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxFrame"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_gauge.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_GAUGE
#if wxUSE_XML && wxUSE_XRC && wxUSE_GAUGE
#include "wx/xrc/xh_gauge.h"
#include "wx/gauge.h"
@ -71,4 +71,4 @@ bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxGauge"));
}
#endif // wxUSE_XRC && wxUSE_GAUGE
#endif // wxUSE_XML && wxUSE_XRC && wxUSE_GAUGE

4
src/xrc/xh_gdctl.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_DIRDLG
#if wxUSE_XML && wxUSE_XRC && wxUSE_DIRDLG
#include "wx/textctrl.h"
#include "wx/xrc/xh_gdctl.h"
@ -60,4 +60,4 @@ bool wxGenericDirCtrlXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxGenericDirCtrl"));
}
#endif // wxUSE_XRC && wxUSE_DIRDLG
#endif // wxUSE_XML && wxUSE_XRC && wxUSE_DIRDLG

4
src/xrc/xh_html.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_HTML
#if wxUSE_XML && wxUSE_XRC && wxUSE_HTML
#include "wx/xrc/xh_html.h"
@ -82,4 +82,4 @@ bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxHtmlWindow"));
}
#endif // wxUSE_XRC && wxUSE_HTML
#endif // wxUSE_XML && wxUSE_XRC && wxUSE_HTML

4
src/xrc/xh_listb.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_listb.h"
#include "wx/listbox.h"
@ -102,4 +102,4 @@ bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node)
(m_insideBox && node->GetName() == wxT("item")));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_listc.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/textctrl.h"
#include "wx/xrc/xh_listc.h"
@ -74,4 +74,4 @@ bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxListCtrl"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_menu.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_menu.h"
#include "wx/menu.h"
@ -142,4 +142,4 @@ bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxMenuBar"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_notbk.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_NOTEBOOK
#if wxUSE_XML && wxUSE_XRC && wxUSE_NOTEBOOK
#include "wx/xrc/xh_notbk.h"
@ -98,4 +98,4 @@ bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node)
(m_isInside && IsOfClass(node, wxT("notebookpage"))));
}
#endif // wxUSE_XRC && wxUSE_NOTEBOOK
#endif // wxUSE_XML && wxUSE_XRC && wxUSE_NOTEBOOK

4
src/xrc/xh_panel.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_panel.h"
#include "wx/panel.h"
@ -57,4 +57,4 @@ bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxPanel"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_radbt.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_RADIOBOX
#if wxUSE_XML && wxUSE_XRC && wxUSE_RADIOBOX
#include "wx/xrc/xh_radbt.h"
#include "wx/radiobut.h"
@ -63,4 +63,4 @@ bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxRadioButton"));
}
#endif // wxUSE_XRC && wxUSE_NOTEBOOK
#endif // wxUSE_XML && wxUSE_XRC && wxUSE_NOTEBOOK

2
src/xrc/xh_radbx.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_RADIOBOX
#if wxUSE_XML && wxUSE_XRC && wxUSE_RADIOBOX
#include "wx/xrc/xh_radbx.h"
#include "wx/radiobox.h"

4
src/xrc/xh_scrol.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_scrol.h"
#include "wx/scrolbar.h"
@ -61,4 +61,4 @@ bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxScrollBar"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_scwin.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_scwin.h"
#include "wx/scrolwin.h"
@ -62,4 +62,4 @@ bool wxScrolledWindowXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxScrolledWindow"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_sizer.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_sizer.h"
#include "wx/sizer.h"
@ -363,4 +363,4 @@ void wxSizerXmlHandler::AddSizerItem(wxSizerItem* sitem)
m_parentSizer->Add(sitem);
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_slidr.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_SLIDER
#if wxUSE_XML && wxUSE_XRC && wxUSE_SLIDER
#include "wx/xrc/xh_slidr.h"
#include "wx/slider.h"
@ -91,4 +91,4 @@ bool wxSliderXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxSlider"));
}
#endif // wxUSE_XRC && wxUSE_SLIDER
#endif // wxUSE_XML && wxUSE_XRC && wxUSE_SLIDER

4
src/xrc/xh_spin.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_spin.h"
@ -105,4 +105,4 @@ bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node)
#endif // wxUSE_SPINCTRL
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_split.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_split.h"
#include "wx/splitter.h"
@ -105,4 +105,4 @@ bool wxSplitterWindowXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxSplitterWindow"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_statbar.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_STATUSBAR
#if wxUSE_XML && wxUSE_XRC && wxUSE_STATUSBAR
#include "wx/frame.h"
#include "wx/string.h"
@ -105,5 +105,5 @@ bool wxStatusBarXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxStatusBar"));
}
#endif // wxUSE_XRC && wxUSE_STATUSBAR
#endif // wxUSE_XML && wxUSE_XRC && wxUSE_STATUSBAR

4
src/xrc/xh_stbmp.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_stbmp.h"
#include "wx/statbmp.h"
@ -53,4 +53,4 @@ bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxStaticBitmap"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_stbox.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_stbox.h"
#include "wx/statbox.h"
@ -53,4 +53,4 @@ bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxStaticBox"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_stlin.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_STATLINE
#if wxUSE_XML && wxUSE_XRC && wxUSE_STATLINE
#include "wx/xrc/xh_stlin.h"
#include "wx/statline.h"
@ -54,4 +54,4 @@ bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxStaticLine"));
}
#endif // wxUSE_XRC && wxUSE_STATLINE
#endif // wxUSE_XML && wxUSE_XRC && wxUSE_STATLINE

4
src/xrc/xh_sttxt.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_sttxt.h"
#include "wx/stattext.h"
@ -57,4 +57,4 @@ bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxStaticText"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_text.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_text.h"
#include "wx/textctrl.h"
@ -71,4 +71,4 @@ bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxTextCtrl"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XML && wxUSE_XRC

4
src/xrc/xh_tglbtn.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_TOGGLEBTN
#if wxUSE_XML && wxUSE_XRC && wxUSE_TOGGLEBTN
#include "wx/xrc/xh_tglbtn.h"
#include "wx/tglbtn.h"
@ -55,4 +55,4 @@ bool wxToggleButtonXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxToggleButton"));
}
#endif // wxUSE_XRC && wxUSE_TOGGLEBTN
#endif // wxUSE_XML && wxUSE_XRC && wxUSE_TOGGLEBTN

2
src/xrc/xh_toolb.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_TOOLBAR
#if wxUSE_XML && wxUSE_XRC && wxUSE_TOOLBAR
#include "wx/xrc/xh_toolb.h"
#include "wx/toolbar.h"

2
src/xrc/xh_tree.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_tree.h"
#include "wx/treectrl.h"

2
src/xrc/xh_unkwn.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xh_unkwn.h"
#include "wx/window.h"

2
src/xrc/xh_wizrd.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_WIZARDDLG
#if wxUSE_XML && wxUSE_XRC && wxUSE_WIZARDDLG
#include "wx/xrc/xh_wizrd.h"
#include "wx/log.h"

2
src/xrc/xmlres.cpp
View File

@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/dialog.h"
#include "wx/panel.h"

2
src/xrc/xmlrsall.cpp
View File

@ -20,7 +20,7 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XML && wxUSE_XRC
#include "wx/xrc/xmlres.h"
#include "wx/xrc/xh_all.h"