projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix some warnings from GCC -Wextra
[wxWidgets.git]
/
samples
/
dataview
/
dataview.cpp
diff --git
a/samples/dataview/dataview.cpp
b/samples/dataview/dataview.cpp
index 8e216d8ea661c686bc3aec7b04d512635b1c7bbe..d4ba3171e42d3742289219a74f2c8a0fb925a28e 100644
(file)
--- a/
samples/dataview/dataview.cpp
+++ b/
samples/dataview/dataview.cpp
@@
-27,9
+27,7
@@
#include "wx/numdlg.h"
#include "wx/dataview.h"
#include "wx/spinctrl.h"
#include "wx/numdlg.h"
#include "wx/dataview.h"
#include "wx/spinctrl.h"
-
-#include "wx/ptr_shrd.h"
-#include "wx/vector.h"
+#include "wx/menu.h"
#ifndef __WXMSW__
#include "../sample.xpm"
#ifndef __WXMSW__
#include "../sample.xpm"
@@
-787,7
+785,7
@@
MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
m_music_model = new MyMusicModel;
m_musicCtrl->AssociateModel( m_music_model.get() );
m_music_model = new MyMusicModel;
m_musicCtrl->AssociateModel( m_music_model.get() );
- wxDataViewTextRenderer *tr = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_INERT
, wxALIGN_RIGHT
);
+ wxDataViewTextRenderer *tr = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_INERT );
wxDataViewColumn *column0 = new wxDataViewColumn( wxT("title"), tr, 0, 200, wxALIGN_LEFT,
wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE );
m_musicCtrl->AppendColumn( column0 );
wxDataViewColumn *column0 = new wxDataViewColumn( wxT("title"), tr, 0, 200, wxALIGN_LEFT,
wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE );
m_musicCtrl->AppendColumn( column0 );
@@
-825,8
+823,8
@@
MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
m_listCtrl->AssociateModel( m_list_model.get() );
#if 1
m_listCtrl->AssociateModel( m_list_model.get() );
#if 1
- m_listCtrl->AppendTextColumn (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE, 120
, wxALIGN_RIGHT
);
- m_listCtrl->AppendIconTextColumn(wx
T("icon"), 1, wxDATAVIEW_CELL_INERT, 60
);
+ m_listCtrl->AppendTextColumn (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE, 120 );
+ m_listCtrl->AppendIconTextColumn(wx
Icon(small1_xpm), 1, wxDATAVIEW_CELL_INERT )->SetTitle( wxT("icon")
);
#else
m_listCtrl->AppendTextColumn (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE );
m_listCtrl->AppendIconTextColumn(wxT("icon"), 1, wxDATAVIEW_CELL_INERT );
#else
m_listCtrl->AppendTextColumn (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE );
m_listCtrl->AppendIconTextColumn(wxT("icon"), 1, wxDATAVIEW_CELL_INERT );
@@
-1039,6
+1037,14
@@
void MyFrame::OnContextMenu( wxDataViewEvent &event )
wxString title = m_music_model->GetTitle( event.GetItem() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s"),title.GetData());
wxString title = m_music_model->GetTitle( event.GetItem() );
wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s"),title.GetData());
+
+ wxMenu *menu = new wxMenu;
+ menu->Append( 1, wxT("entry 1") );
+ menu->Append( 2, wxT("entry 2") );
+ menu->Append( 3, wxT("entry 3") );
+
+ m_musicCtrl->PopupMenu( menu );
+
// wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s Value: %s"),title.GetData(), event.GetValue().GetString());
}
// wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s Value: %s"),title.GetData(), event.GetValue().GetString());
}