projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge.
[dcpomatic.git]
/
src
/
wx
/
audio_mapping_view.cc
diff --git
a/src/wx/audio_mapping_view.cc
b/src/wx/audio_mapping_view.cc
index 859c4d54859c3243d89170cd164cb465c8aac339..5f0f74d23e17cdbf71d211a03490046c301124ce 100644
(file)
--- a/
src/wx/audio_mapping_view.cc
+++ b/
src/wx/audio_mapping_view.cc
@@
-56,11
+56,7
@@
public:
void Draw (wxGrid& grid, wxGridCellAttr &, wxDC& dc, const wxRect& rect, int row, int col, bool)
{
void Draw (wxGrid& grid, wxGridCellAttr &, wxDC& dc, const wxRect& rect, int row, int col, bool)
{
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9
dc.SetPen (*wxThePenList->FindOrCreatePen (wxColour (255, 255, 255), 0, wxPENSTYLE_SOLID));
dc.SetPen (*wxThePenList->FindOrCreatePen (wxColour (255, 255, 255), 0, wxPENSTYLE_SOLID));
-#else
- dc.SetPen (*wxThePenList->FindOrCreatePen (wxColour (255, 255, 255), 0, wxSOLID));
-#endif
dc.DrawRectangle (rect);
wxRendererNative::Get().DrawCheckBox (
dc.DrawRectangle (rect);
wxRendererNative::Get().DrawCheckBox (
@@
-88,11
+84,7
@@
AudioMappingView::AudioMappingView (wxWindow* parent)
_grid = new wxGrid (this, wxID_ANY);
_grid->CreateGrid (0, 7);
_grid = new wxGrid (this, wxID_ANY);
_grid->CreateGrid (0, 7);
-#if wxMINOR_VERSION == 9
_grid->HideRowLabels ();
_grid->HideRowLabels ();
-#else
- _grid->SetRowLabelSize (0);
-#endif
_grid->DisableDragRowSize ();
_grid->DisableDragColSize ();
_grid->EnableEditing (false);
_grid->DisableDragRowSize ();
_grid->DisableDragColSize ();
_grid->EnableEditing (false);