[Greater-commits] r189 - trunk/Administration

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu Jun 9 18:58:39 CEST 2011 

Author: aheinecke
Date: 2011-06-09 18:58:37 +0200 (Thu, 09 Jun 2011)
New Revision: 189

Added:
   trunk/Administration/wxcommon.h
Removed:
   trunk/Administration/wx/
Modified:
   trunk/Administration/Administration.h
   trunk/Administration/AuthenticateDialog.h
   trunk/Administration/BackgrdDialog.h
   trunk/Administration/BinobjDialog.h
   trunk/Administration/CatchmentDialog.h
   trunk/Administration/DownloadDialog.h
   trunk/Administration/EnvironmentDialog.h
   trunk/Administration/EnvtreeDialog.h
   trunk/Administration/ExportDialog.h
   trunk/Administration/FixedTextCtrl.h
   trunk/Administration/GroupDialog.h
   trunk/Administration/ImportDialog.h
   trunk/Administration/MainWindow.cpp
   trunk/Administration/MessageDialog.h
   trunk/Administration/MyButton.h
   trunk/Administration/MyGrid.h
   trunk/Administration/PanelBackgrd.h
   trunk/Administration/PanelBase.h
   trunk/Administration/PanelBinobj.h
   trunk/Administration/PanelCatchment.h
   trunk/Administration/PanelEnvironment.h
   trunk/Administration/PanelEnvtree.h
   trunk/Administration/PanelGroup.h
   trunk/Administration/PanelMessage.h
   trunk/Administration/PanelParatree.h
   trunk/Administration/PanelPhrase.h
   trunk/Administration/PanelSession.h
   trunk/Administration/PanelSubstance.h
   trunk/Administration/PanelSubsttree.h
   trunk/Administration/PanelUser.h
   trunk/Administration/ParatreeDialog.h
   trunk/Administration/PhraseDialog.h
   trunk/Administration/PwdDialog.h
   trunk/Administration/SessionDialog.h
   trunk/Administration/SubstanceDialog.h
   trunk/Administration/SubsttreeDialog.h
   trunk/Administration/UserDialog.h
Log:
Change the wx/prec.h precompiled header workaround to a decent solution
using a common header for this functionality


Modified: trunk/Administration/Administration.h
===================================================================
--- trunk/Administration/Administration.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/Administration.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -49,7 +49,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include <wx/app.h>
 #include "MainWindow.h"
 

Modified: trunk/Administration/AuthenticateDialog.h
===================================================================
--- trunk/Administration/AuthenticateDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/AuthenticateDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif //_MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include <wx/dialog.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>

Modified: trunk/Administration/BackgrdDialog.h
===================================================================
--- trunk/Administration/BackgrdDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/BackgrdDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -49,7 +49,7 @@
 #pragma once
 #endif //_MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include <wx/stattext.h>
 #include <wx/choice.h>
 #include <wx/dialog.h>

Modified: trunk/Administration/BinobjDialog.h
===================================================================
--- trunk/Administration/BinobjDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/BinobjDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif //_MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "PanelBinobj.h"
 #include "FixedTextCtrl.h"
 class BinobjDialog : public wxDialog  

Modified: trunk/Administration/CatchmentDialog.h
===================================================================
--- trunk/Administration/CatchmentDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/CatchmentDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif //_MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "PanelCatchment.h"
 #include "FixedTextCtrl.h"
 

Modified: trunk/Administration/DownloadDialog.h
===================================================================
--- trunk/Administration/DownloadDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/DownloadDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -49,7 +49,7 @@
 #pragma once
 #endif //_MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "PanelBinobj.h"
 
 class DownloadDialog : public wxDialog  

Modified: trunk/Administration/EnvironmentDialog.h
===================================================================
--- trunk/Administration/EnvironmentDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/EnvironmentDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif //_MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "PanelEnvironment.h"
 #include "FixedTextCtrl.h"
 

Modified: trunk/Administration/EnvtreeDialog.h
===================================================================
--- trunk/Administration/EnvtreeDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/EnvtreeDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -49,7 +49,7 @@
 #pragma once
 #endif //_MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "PanelEnvtree.h"
 #include "FixedTextCtrl.h"
 

Modified: trunk/Administration/ExportDialog.h
===================================================================
--- trunk/Administration/ExportDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/ExportDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -49,7 +49,7 @@
 #pragma once
 #endif //_MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MainWindow.h"
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/dom/DOMImplementation.hpp>

Modified: trunk/Administration/FixedTextCtrl.h
===================================================================
--- trunk/Administration/FixedTextCtrl.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/FixedTextCtrl.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -41,7 +41,7 @@
 #ifndef __FIXEDTEXT_CTRL__
 #define __FIXEDTEXT_CTRL__
 
-#include "wx/wxprec.h"
+#include "wxcommon.h"
 
 class FixedTextCtrl : public wxTextCtrl
 {

Modified: trunk/Administration/GroupDialog.h
===================================================================
--- trunk/Administration/GroupDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/GroupDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif //_MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "PanelGroup.h"
 #include "FixedTextCtrl.h"
 

Modified: trunk/Administration/ImportDialog.h
===================================================================
--- trunk/Administration/ImportDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/ImportDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -49,7 +49,7 @@
 #pragma once
 #endif //_MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MainWindow.h"
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/dom/DOMImplementation.hpp>

Modified: trunk/Administration/MainWindow.cpp
===================================================================
--- trunk/Administration/MainWindow.cpp	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/MainWindow.cpp	2011-06-09 16:58:37 UTC (rev 189)
@@ -13,7 +13,7 @@
 * -------------------------------------------------------------------------
 **************************************************************************/
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include <wx/notebook.h>
 #include "MainWindow.h"
 #include "AuthenticateDialog.h"

Modified: trunk/Administration/MessageDialog.h
===================================================================
--- trunk/Administration/MessageDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/MessageDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "PanelMessage.h"
 #include "FixedTextCtrl.h"
 

Modified: trunk/Administration/MyButton.h
===================================================================
--- trunk/Administration/MyButton.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/MyButton.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -45,7 +45,7 @@
 #ifndef __MYBUTTON_H__
 #define __MYBUTTON_H__
 
-#include "wx/wxprec.h"
+#include "wxcommon.h"
 #include "wx/button.h"
 extern "C"
 {

Modified: trunk/Administration/MyGrid.h
===================================================================
--- trunk/Administration/MyGrid.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/MyGrid.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -46,7 +46,7 @@
 #ifndef __MYGRID_H__
 #define __MYGRID_H__
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include <wx/grid.h>
 extern "C"
 {

Modified: trunk/Administration/PanelBackgrd.h
===================================================================
--- trunk/Administration/PanelBackgrd.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelBackgrd.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MyGrid.h"
 #include "MyButton.h"
 #include "PanelBase.h"

Modified: trunk/Administration/PanelBase.h
===================================================================
--- trunk/Administration/PanelBase.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelBase.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -45,7 +45,7 @@
 #ifndef __PANELBASE_H__
 #define __PANELBASE_H__
 
-#include "wx/wxprec.h"
+#include "wxcommon.h"
 #include "MyGrid.h"
   
 class PanelBase : public wxPanel 

Modified: trunk/Administration/PanelBinobj.h
===================================================================
--- trunk/Administration/PanelBinobj.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelBinobj.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MyGrid.h"
 #include "MyButton.h"
 #include "PanelBase.h"

Modified: trunk/Administration/PanelCatchment.h
===================================================================
--- trunk/Administration/PanelCatchment.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelCatchment.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -49,7 +49,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MyGrid.h"
 #include "MyButton.h"
 #include "PanelBase.h"

Modified: trunk/Administration/PanelEnvironment.h
===================================================================
--- trunk/Administration/PanelEnvironment.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelEnvironment.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MyGrid.h"
 #include "MyButton.h"
 #include "PanelBase.h"

Modified: trunk/Administration/PanelEnvtree.h
===================================================================
--- trunk/Administration/PanelEnvtree.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelEnvtree.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MyGrid.h"
 #include "MyButton.h"
 #include "PanelBase.h"

Modified: trunk/Administration/PanelGroup.h
===================================================================
--- trunk/Administration/PanelGroup.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelGroup.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MyGrid.h"
 #include "MyButton.h"
 #include "PanelBase.h"

Modified: trunk/Administration/PanelMessage.h
===================================================================
--- trunk/Administration/PanelMessage.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelMessage.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MyGrid.h"
 #include "MyButton.h"
 #include "PanelBase.h"

Modified: trunk/Administration/PanelParatree.h
===================================================================
--- trunk/Administration/PanelParatree.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelParatree.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MyGrid.h"
 #include "MyButton.h"
 #include "PanelBase.h"

Modified: trunk/Administration/PanelPhrase.h
===================================================================
--- trunk/Administration/PanelPhrase.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelPhrase.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MyGrid.h"
 #include "MyButton.h"
 #include "PanelBase.h"

Modified: trunk/Administration/PanelSession.h
===================================================================
--- trunk/Administration/PanelSession.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelSession.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MyGrid.h"
 #include "MyButton.h"
 #include "PanelBase.h"

Modified: trunk/Administration/PanelSubstance.h
===================================================================
--- trunk/Administration/PanelSubstance.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelSubstance.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MyGrid.h"
 #include "MyButton.h"
 #include "PanelBase.h"

Modified: trunk/Administration/PanelSubsttree.h
===================================================================
--- trunk/Administration/PanelSubsttree.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelSubsttree.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MyGrid.h"
 #include "MyButton.h"
 #include "PanelBase.h"

Modified: trunk/Administration/PanelUser.h
===================================================================
--- trunk/Administration/PanelUser.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PanelUser.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -49,7 +49,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "MyGrid.h"
 #include "MyButton.h"
 #include "PanelBase.h"

Modified: trunk/Administration/ParatreeDialog.h
===================================================================
--- trunk/Administration/ParatreeDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/ParatreeDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -49,7 +49,7 @@
 #pragma once
 #endif //_MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "PanelParatree.h"
 #include "FixedTextCtrl.h"
 

Modified: trunk/Administration/PhraseDialog.h
===================================================================
--- trunk/Administration/PhraseDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PhraseDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -50,7 +50,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "PanelPhrase.h"
 #include "FixedTextCtrl.h"
 

Modified: trunk/Administration/PwdDialog.h
===================================================================
--- trunk/Administration/PwdDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/PwdDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -50,7 +50,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "wx/wxprec.h"
+#include "wxcommon.h"
 
 class PwdDialog : public wxDialog
 {

Modified: trunk/Administration/SessionDialog.h
===================================================================
--- trunk/Administration/SessionDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/SessionDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "PanelSession.h"
 #include "FixedTextCtrl.h"
 

Modified: trunk/Administration/SubstanceDialog.h
===================================================================
--- trunk/Administration/SubstanceDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/SubstanceDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -48,7 +48,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "PanelSubstance.h"
 #include "FixedTextCtrl.h"
 

Modified: trunk/Administration/SubsttreeDialog.h
===================================================================
--- trunk/Administration/SubsttreeDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/SubsttreeDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -49,7 +49,7 @@
 #pragma once
 #endif //_MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "PanelSubsttree.h"
 #include "FixedTextCtrl.h"
 

Modified: trunk/Administration/UserDialog.h
===================================================================
--- trunk/Administration/UserDialog.h	2011-06-09 16:48:10 UTC (rev 188)
+++ trunk/Administration/UserDialog.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -49,7 +49,7 @@
 #pragma once
 #endif //_MSC_VER > 1000
 
-#include <wx/wxprec.h>
+#include <wxcommon.h>
 #include "PanelUser.h"
 #include "FixedTextCtrl.h"
 

Copied: trunk/Administration/wxcommon.h (from rev 175, trunk/Administration/wx/wxprec.h)
===================================================================
--- trunk/Administration/wx/wxprec.h	2011-06-09 10:57:29 UTC (rev 175)
+++ trunk/Administration/wxcommon.h	2011-06-09 16:58:37 UTC (rev 189)
@@ -0,0 +1,34 @@
+/* wxcommon.h
+*
+* Description: Common includes for wXWidgets includes the precompiled
+*              Header when MSVC is used
+*
+* Authors:
+* Andre Heinecke <aheinecke at intevation.de>
+*
+* Copyright:
+* Copyright (C) 2011 by Intevation GmbH
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2
+*
+* This program 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
+* along with this program; if not, write to the Free Software */
+#ifndef __WXCOMMON_H__
+#define __WXCOMMON_H__
+
+#include <wxcommon.h>
+#include <wx/event.h>
+#include <wx/dialog.h>
+#include <wx/stattext.h>
+
+#ifndef _MSC_VER
+#include "wx/wx.h"
+#endif
+
+#endif // __WXCOMMON_H__


Property changes on: trunk/Administration/wxcommon.h
___________________________________________________________________
Name: svn:mergeinfo
   +

More information about the Greater-commits mailing list