From cfb667630611a92b0243b7f5767cbe3f750a3d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Mon, 13 Mar 2006 09:18:22 +0000
Subject: [PATCH] Make wxListCtrl changes ported from 2.6 branch complete (fix
 for long list of errors at wxTinderbox).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/listctrl/listtest.cpp | 5 ++---
 samples/listctrl/listtest.h   | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 7250a74c38..c472a5fb2c 100644
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -162,11 +162,11 @@ bool MyApp::OnInit()
 
 // My frame constructor
 MyFrame::MyFrame(const wxChar *title)
-       : wxFrame(NULL, wxID_ANY, title, wxDefaultPosition, wxDefaultSize))
+       : wxFrame(NULL, wxID_ANY, title)
 {
     if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_SMALL)
         SetSize(wxSize(450, 340));
-    
+
     m_listCtrl = NULL;
     m_logWindow = NULL;
     m_smallVirtual = false;
@@ -1084,4 +1084,3 @@ void MyListCtrl::ShowContextMenu(const wxPoint& pos)
 
     PopupMenu(&menu, pos.x, pos.y);
 }
-
diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index adbc329c22..2673ce0e98 100644
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -71,11 +71,14 @@ public:
     void OnCacheHint(wxListEvent& event);
 
     void OnChar(wxKeyEvent& event);
+
 #if USE_CONTEXT_MENU
     void OnContextMenu(wxContextMenuEvent& event);
 #endif
 
 private:
+    void ShowContextMenu(const wxPoint& pos);
+    wxLog *m_logOld;
     void SetColumnImage(int col, int image);
 
     void LogEvent(const wxListEvent& event, const wxChar *eventName);
@@ -201,4 +204,3 @@ enum
 
     LIST_CTRL                   = 1000
 };
-