projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix alignment of mail protocol control (#2042).
[dcpomatic.git]
/
src
/
wx
/
table_dialog.h
diff --git
a/src/wx/table_dialog.h
b/src/wx/table_dialog.h
index 23017c3b635c2d4652e229e0aa67cbbd3d262493..fdc2022c84f6a39033f54794ecd09927d1cf35f1 100644
(file)
--- a/
src/wx/table_dialog.h
+++ b/
src/wx/table_dialog.h
@@
-1,47
+1,52
@@
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef DCPOMATIC_TABLE_DIALOG_H
#define DCPOMATIC_TABLE_DIALOG_H
*/
#ifndef DCPOMATIC_TABLE_DIALOG_H
#define DCPOMATIC_TABLE_DIALOG_H
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
class TableDialog : public wxDialog
{
public:
class TableDialog : public wxDialog
{
public:
- TableDialog (wxWindow* parent, wxString title, int columns, bool cancel);
+ TableDialog (wxWindow* parent, wxString title, int columns,
int growable,
bool cancel);
protected:
template<class T>
protected:
template<class T>
- T* add (T* w) {
- _table->Add (w,
1, wxEXPAND
);
+ T* add (T* w
, int proportion = 1, int flag = wxEXPAND
) {
+ _table->Add (w,
proportion, flag
);
return w;
}
return w;
}
-
void
add (wxString text, bool label);
+
wxStaticText*
add (wxString text, bool label);
void add_spacer ();
void add_spacer ();
-
+
void layout ();
void layout ();
-private:
- wxSizer* _overall_sizer;
wxFlexGridSizer* _table;
wxFlexGridSizer* _table;
+
+private:
+ wxSizer* _overall_sizer;
};
#endif
};
#endif