projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1945421 applied
[wxWidgets.git]
/
src
/
xrc
/
xh_tree.cpp
diff --git
a/src/xrc/xh_tree.cpp
b/src/xrc/xh_tree.cpp
index 7a21b5f4407b91845edcaa3720c363f5048c9f46..1591d626a75c43f41eb91c57415cdb5d8cbb4c2a 100644
(file)
--- a/
src/xrc/xh_tree.cpp
+++ b/
src/xrc/xh_tree.cpp
@@
-8,10
+8,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "xh_tree.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-19,7
+15,7
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_X
ML && wxUSE_XRC
+#if wxUSE_X
RC && wxUSE_TREECTRL
#include "wx/xrc/xh_tree.h"
#include "wx/treectrl.h"
#include "wx/xrc/xh_tree.h"
#include "wx/treectrl.h"
@@
-41,8
+37,10
@@
wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler()
XRC_ADD_STYLE(wxTR_HAS_VARIABLE_ROW_HEIGHT);
XRC_ADD_STYLE(wxTR_SINGLE);
XRC_ADD_STYLE(wxTR_MULTIPLE);
XRC_ADD_STYLE(wxTR_HAS_VARIABLE_ROW_HEIGHT);
XRC_ADD_STYLE(wxTR_SINGLE);
XRC_ADD_STYLE(wxTR_MULTIPLE);
- XRC_ADD_STYLE(wxTR_EXTENDED);
XRC_ADD_STYLE(wxTR_DEFAULT_STYLE);
XRC_ADD_STYLE(wxTR_DEFAULT_STYLE);
+#if WXWIN_COMPATIBILITY_2_8
+ XRC_ADD_STYLE(wxTR_EXTENDED);
+#endif
AddWindowStyles();
}
AddWindowStyles();
}
@@
-67,4
+65,4
@@
bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxTreeCtrl"));
}
return IsOfClass(node, wxT("wxTreeCtrl"));
}
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC
&& wxUSE_TREECTRL