| Index: views/controls/tree/tree_view.cc
|
| ===================================================================
|
| --- views/controls/tree/tree_view.cc (revision 16052)
|
| +++ views/controls/tree/tree_view.cc (working copy)
|
| @@ -4,7 +4,9 @@
|
|
|
| #include "views/controls/tree/tree_view.h"
|
|
|
| -#include <shellapi.h>
|
| +#include <atlbase.h>
|
| +#include <atlapp.h>
|
| +#include <atlmisc.h>
|
|
|
| #include "app/gfx/chrome_canvas.h"
|
| #include "app/gfx/icon_util.h"
|
| @@ -30,7 +32,7 @@
|
| process_enter_(false),
|
| show_context_menu_only_when_node_selected_(true),
|
| select_on_right_mouse_down_(true),
|
| - wrapper_(this),
|
| + ALLOW_THIS_IN_INITIALIZER_LIST(wrapper_(this)),
|
| original_handler_(NULL),
|
| drag_enabled_(false),
|
| has_custom_icons_(false),
|
| @@ -481,7 +483,7 @@
|
| return false;
|
| }
|
|
|
| -void TreeView::OnContextMenu(const CPoint& location) {
|
| +void TreeView::OnContextMenu(const WTL::CPoint& location) {
|
| if (!GetContextMenuController())
|
| return;
|
|
|
|
|