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
This commit is contained in:
parent
7891b4d450
commit
cfb6676306
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user