[Greater-commits] r282 - trunk/Administration
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Jun 27 14:43:41 CEST 2011
Author: bricks
Date: 2011-06-27 14:43:40 +0200 (Mon, 27 Jun 2011)
New Revision: 282
Modified:
trunk/Administration/GroupDialog.cpp
trunk/Administration/PanelBackgrd.cpp
trunk/Administration/PanelBase.h
trunk/Administration/PanelBinobj.cpp
trunk/Administration/PanelCatchment.cpp
trunk/Administration/PanelEnvironment.cpp
trunk/Administration/PanelEnvtree.cpp
trunk/Administration/PanelGroup.cpp
trunk/Administration/PanelGroup.h
trunk/Administration/PanelMessage.cpp
trunk/Administration/PanelParatree.cpp
trunk/Administration/PanelPhrase.cpp
trunk/Administration/PanelSession.cpp
trunk/Administration/PanelSubstance.cpp
trunk/Administration/PanelSubsttree.cpp
trunk/Administration/PanelUser.cpp
Log:
Move GRID_BUTTON_HEIGHT into PanelBase class
Modified: trunk/Administration/GroupDialog.cpp
===================================================================
--- trunk/Administration/GroupDialog.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/GroupDialog.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -206,12 +206,12 @@
| wxALIGN_CENTER_VERTICAL);
sizer_level_4_fg->Add(-1, -1);
sizer_level_4_fg->Add(-1, -1);
- //5th row (multi line text control)
- sizer_level_3_v->Add(ftextRemark, 0, wxGROW);
- //third column is flexible in size
- sizer_level_4_fg->AddGrowableCol(2);
- sizer_level_3_v->Add(-1, DISTANCES);
- sizer_level_3_v->Add(sizer_level_4_h, 0, wxGROW);
+ //5th row (multi line text control)
+ sizer_level_3_v->Add(ftextRemark, 0, wxGROW);
+ //third column is flexible in size
+ sizer_level_4_fg->AddGrowableCol(2);
+ sizer_level_3_v->Add(-1, DISTANCES);
+ sizer_level_3_v->Add(sizer_level_4_h, 0, wxGROW);
if (type == 1)
{
sizer_level_4_h->Add(buttonCreate, 1);
@@ -234,8 +234,6 @@
//Calculate layout
Layout();
-
-
}
/*********************************************************************
Modified: trunk/Administration/PanelBackgrd.cpp
===================================================================
--- trunk/Administration/PanelBackgrd.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelBackgrd.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -45,11 +45,6 @@
PanelBackgrd::PanelBackgrd(wxWindow* parent, wxWindowID id)
:PanelBase(parent, id)
{
-
- //height of the buttons below the grid
- const int GRID_BUTTON_HEIGHT = 20;
-
-
//Creation of backgrd grid
backgrdGrid = new MyGrid(this, -1, wxDefaultPosition, wxDefaultSize,
wxSUNKEN_BORDER);
Modified: trunk/Administration/PanelBase.h
===================================================================
--- trunk/Administration/PanelBase.h 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelBase.h 2011-06-27 12:43:40 UTC (rev 282)
@@ -57,9 +57,12 @@
virtual void OnKeyGoBack() = 0;
virtual void OnKeyGoForward() = 0;
virtual void Insert(int target, int source) = 0;
+protected:
+ //height of the buttons below the grid
+ static const int GRID_BUTTON_HEIGHT = 30;
private:
DECLARE_EVENT_TABLE()
};
-#endif
\ No newline at end of file
+#endif
Modified: trunk/Administration/PanelBinobj.cpp
===================================================================
--- trunk/Administration/PanelBinobj.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelBinobj.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -46,9 +46,6 @@
PanelBinobj::PanelBinobj(wxWindow* parent, wxWindowID id)
:PanelBase(parent, id)
{
- //height of the buttons below the grid
- const int GRID_BUTTON_HEIGHT = 20;
-
//initialise API pointer for binary object data
p_binobj = NULL;
Modified: trunk/Administration/PanelCatchment.cpp
===================================================================
--- trunk/Administration/PanelCatchment.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelCatchment.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -43,9 +43,6 @@
PanelCatchment::PanelCatchment(wxWindow* parent, wxWindowID id)
:PanelBase(parent, id)
{
- //height of the buttons below the grid
- const int GRID_BUTTON_HEIGHT = 20;
-
//initialise API pointer for catchment data
p_catch = NULL;
Modified: trunk/Administration/PanelEnvironment.cpp
===================================================================
--- trunk/Administration/PanelEnvironment.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelEnvironment.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -43,9 +43,6 @@
PanelEnvironment::PanelEnvironment(wxWindow* parent, wxWindowID id)
:PanelBase(parent, id)
{
- //height of the buttons below the grid
- const int GRID_BUTTON_HEIGHT = 20;
-
//initialise API pointer for environment data
p_env = NULL;
Modified: trunk/Administration/PanelEnvtree.cpp
===================================================================
--- trunk/Administration/PanelEnvtree.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelEnvtree.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -44,9 +44,6 @@
PanelEnvtree::PanelEnvtree(wxWindow* parent, wxWindowID id)
:PanelBase(parent, id)
{
- //height of the buttons below the grid
- const int GRID_BUTTON_HEIGHT = 20;
-
//initialise API pointer for environment tree data
p_envtree = NULL;
Modified: trunk/Administration/PanelGroup.cpp
===================================================================
--- trunk/Administration/PanelGroup.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelGroup.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -46,9 +46,6 @@
:PanelBase(parent, id)
{
- //height of the buttons below the grid
- const int GRID_BUTTON_HEIGHT = 20;
-
//initialise API pointer for group data
p_group = NULL;
Modified: trunk/Administration/PanelGroup.h
===================================================================
--- trunk/Administration/PanelGroup.h 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelGroup.h 2011-06-27 12:43:40 UTC (rev 282)
@@ -62,7 +62,7 @@
class PanelGroup : public PanelBase
{
public:
- PanelGroup(wxWindow* parent, wxWindowID id);
+ PanelGroup(wxWindow* parent, wxWindowID id);
~PanelGroup();
void EnablePanel(bool enable);
MyGrid* GetGroupGrid();
@@ -106,7 +106,7 @@
DA_T_group* p_group;
void OnButtonNew(wxCommandEvent &event);
- void OnButtonEdit(wxCommandEvent &event);
+ void OnButtonEdit(wxCommandEvent &event);
void OnButtonDelete(wxCommandEvent &event);
void OnButtonReload(wxCommandEvent &event);
void EnableButtons(bool enable);
Modified: trunk/Administration/PanelMessage.cpp
===================================================================
--- trunk/Administration/PanelMessage.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelMessage.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -43,10 +43,6 @@
PanelMessage::PanelMessage(wxWindow* parent, wxWindowID id)
:PanelBase(parent, id)
{
-
- //height of the buttons below the grid
- const int GRID_BUTTON_HEIGHT = 20;
-
//initialise API pointer for message data
p_message = NULL;
Modified: trunk/Administration/PanelParatree.cpp
===================================================================
--- trunk/Administration/PanelParatree.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelParatree.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -44,9 +44,6 @@
PanelParatree::PanelParatree(wxWindow* parent, wxWindowID id)
:PanelBase(parent, id)
{
- //height of the buttons below the grid
- const int GRID_BUTTON_HEIGHT = 20;
-
//initialise API pointer for parameter tree data
p_paratree = NULL;
Modified: trunk/Administration/PanelPhrase.cpp
===================================================================
--- trunk/Administration/PanelPhrase.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelPhrase.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -45,10 +45,6 @@
PanelPhrase::PanelPhrase(wxWindow* parent, wxWindowID id)
:PanelBase(parent, id)
{
-
- //height of the buttons below the grid
- const int GRID_BUTTON_HEIGHT = 20;
-
//initialise API pointer for phrase data
p_phrase = NULL;
Modified: trunk/Administration/PanelSession.cpp
===================================================================
--- trunk/Administration/PanelSession.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelSession.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -43,9 +43,6 @@
PanelSession::PanelSession(wxWindow* parent, wxWindowID id)
:PanelBase(parent, id)
{
- //height of the buttons below the grid
- const int GRID_BUTTON_HEIGHT = 20;
-
//initialise API pointer for session data
p_sess = NULL;
Modified: trunk/Administration/PanelSubstance.cpp
===================================================================
--- trunk/Administration/PanelSubstance.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelSubstance.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -43,9 +43,6 @@
PanelSubstance::PanelSubstance(wxWindow* parent, wxWindowID id)
:PanelBase(parent, id)
{
- //height of the buttons below the grid
- const int GRID_BUTTON_HEIGHT = 20;
-
//initialise API pointer for substance data
p_subst = NULL;
Modified: trunk/Administration/PanelSubsttree.cpp
===================================================================
--- trunk/Administration/PanelSubsttree.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelSubsttree.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -44,9 +44,6 @@
PanelSubsttree::PanelSubsttree(wxWindow* parent, wxWindowID id)
:PanelBase(parent, id)
{
- //height of the buttons below the grid
- const int GRID_BUTTON_HEIGHT = 20;
-
//initialise API pointer for substance tree data
p_substtree = NULL;
Modified: trunk/Administration/PanelUser.cpp
===================================================================
--- trunk/Administration/PanelUser.cpp 2011-06-27 12:35:17 UTC (rev 281)
+++ trunk/Administration/PanelUser.cpp 2011-06-27 12:43:40 UTC (rev 282)
@@ -45,10 +45,6 @@
PanelUser::PanelUser(wxWindow* parent, wxWindowID id)
:PanelBase(parent, id)
{
-
- //height of the buttons below the grid
- const int GRID_BUTTON_HEIGHT = 20;
-
//initialise API pointer for user data
p_user = NULL;
More information about the Greater-commits
mailing list