projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation in !wxUSE_MENUS case.
[wxWidgets.git]
/
src
/
xrc
/
xh_tree.cpp
diff --git
a/src/xrc/xh_tree.cpp
b/src/xrc/xh_tree.cpp
index d9ee3ad6d6cf1e655ef29e3d49dc4e14d9838fb9..b2db5a257ec0439976db6eb061c7412a0a0c2c9a 100644
(file)
--- a/
src/xrc/xh_tree.cpp
+++ b/
src/xrc/xh_tree.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_tree.cpp
+// Name:
src/xrc/
xh_tree.cpp
// Purpose: XRC resource for wxTreeCtrl
// Author: Brian Gavin
// Created: 2000/09/09
// Purpose: XRC resource for wxTreeCtrl
// Author: Brian Gavin
// Created: 2000/09/09
@@
-8,10
+8,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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"
@@
-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();
}
@@
-53,10
+51,14
@@
wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
tree->Create(m_parentAsWindow,
GetID(),
GetPosition(), GetSize(),
tree->Create(m_parentAsWindow,
GetID(),
GetPosition(), GetSize(),
- GetStyle(
_
T("style"), wxTR_DEFAULT_STYLE),
+ GetStyle(
wx
T("style"), wxTR_DEFAULT_STYLE),
wxDefaultValidator,
GetName());
wxDefaultValidator,
GetName());
+ wxImageList *imagelist = GetImageList();
+ if ( imagelist )
+ tree->AssignImageList(imagelist);
+
SetupWindow(tree);
return tree;
SetupWindow(tree);
return tree;