X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3d0aa773d86c2451336b2c4146a279bae628af6..b6b85bdccb56b9eb8d4e5ebce4dc3ff776fc9ce8:/samples/treectrl/treectrl.cpp

diff --git a/samples/treectrl/treectrl.cpp b/samples/treectrl/treectrl.cpp
index 2bb7c13e98..749bc0d3c9 100644
--- a/samples/treectrl/treectrl.cpp
+++ b/samples/treectrl/treectrl.cpp
@@ -155,6 +155,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
     // Give it an icon
     SetIcon(wxICON(mondrian));
 
+#if wxUSE_MENUS
     // Make a menubar
     wxMenu *file_menu = new wxMenu,
            *tree_menu = new wxMenu,
@@ -215,17 +216,18 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
     SetMenuBar(menu_bar);
 
     menu_bar->Check(TreeTest_ToggleImages, TRUE);
+#endif // wxUSE_MENUS
 
     m_treeCtrl = new MyTreeCtrl(this, TreeTest_Ctrl,
                                 wxDefaultPosition, wxDefaultSize,
-                                wxTR_HAS_BUTTONS | // wxTR_NO_LINES |
+                                wxTR_MAC_BUTTONS | wxTR_NO_LINES |
                                 wxTR_EDIT_LABELS |
 #ifndef NO_VARIABLE_HEIGHT
                                 wxTR_HAS_VARIABLE_ROW_HEIGHT |
 #endif
                                 wxSUNKEN_BORDER);
 
-    m_treeCtrl->SetBackgroundColour(wxColour(204, 205, 79));
+//    m_treeCtrl->SetBackgroundColour( *wxLIGHT_GREY );
 
     m_textCtrl = new wxTextCtrl(this, -1, "",
                                 wxDefaultPosition, wxDefaultSize,
@@ -867,11 +869,13 @@ void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt)
         title = _T("Menu for no particular item");
     }
 
+#if wxUSE_MENUS
     wxMenu menu(title);
     menu.Append(TreeTest_About, _T("&About..."));
     menu.Append(TreeTest_Dump, _T("&Dump"));
 
     PopupMenu(&menu, pt);
+#endif // wxUSE_MENUS
 }
 
 void MyTreeCtrl::OnRMouseDClick(wxMouseEvent& event)