Make wxListCtrl changes ported from 2.6 branch complete (fix for long list of errors...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 7250a74c382d4505facd3ff3c843770d622fa0e4..c472a5fb2cad99e30af28b246a3ecf068c75dea7 100644 (file)
--- 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)
 
 // 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));
 {
     if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_SMALL)
         SetSize(wxSize(450, 340));

-    
+

     m_listCtrl = NULL;
     m_logWindow = NULL;
     m_smallVirtual = false;
     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);
 }
 
     PopupMenu(&menu, pos.x, pos.y);
 }

-

diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index adbc329c22847cfc1b41cad84d66a1bdb21bab69..2673ce0e988cd27139256cc630777dde44136e49 100644 (file)
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -71,11 +71,14 @@ public:
     void OnCacheHint(wxListEvent& event);
 
     void OnChar(wxKeyEvent& event);
     void OnCacheHint(wxListEvent& event);
 
     void OnChar(wxKeyEvent& event);

+

 #if USE_CONTEXT_MENU
     void OnContextMenu(wxContextMenuEvent& event);
 #endif
 
 private:
 #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);
     void SetColumnImage(int col, int image);
 
     void LogEvent(const wxListEvent& event, const wxChar *eventName);


@@ -201,4 +204,3 @@ enum
 
     LIST_CTRL                   = 1000
 };
 
     LIST_CTRL                   = 1000
 };

-