[Plplot-cvs] SF.net SVN: plplot:[9715] trunk/drivers

[<sm...@us...>]

Revision: 9715
          http://plplot.svn.sourceforge.net/plplot/?rev=9715&view=rev
Author:   smekal
Date:     2009-03-11 14:33:48 +0000 (Wed, 11 Mar 2009)

Log Message:
-----------
Applied a patch by Vadim Zeitlin where all inclusions of wx/wx.h are moved to top before any other header inclusions. Otherwise winsock.h may be included before wxWidgets has the chance to include winsock2.h (if compiled with IPv6 support) which leads to compiler errors (on Win32).

Modified Paths:
--------------
    trunk/drivers/wxwidgets.cpp
    trunk/drivers/wxwidgets_agg.cpp
    trunk/drivers/wxwidgets_app.cpp
    trunk/drivers/wxwidgets_dc.cpp
    trunk/drivers/wxwidgets_gc.cpp

Modified: trunk/drivers/wxwidgets.cpp
===================================================================
--- trunk/drivers/wxwidgets.cpp	2009-03-11 05:28:45 UTC (rev 9714)
+++ trunk/drivers/wxwidgets.cpp	2009-03-11 14:33:48 UTC (rev 9715)
@@ -25,6 +25,11 @@
  * - NA
  */
 
+/* wxwidgets headers */
+#include <wx/wx.h>
+#include <wx/wfstream.h>
+#include <wx/except.h>
+
 #include "plDevs.h"
 
 /* plplot headers */
@@ -34,11 +39,6 @@
 /* C/C++ headers */
 #include <cstdio>
 
-/* wxwidgets headers */
-#include <wx/wx.h>
-#include <wx/wfstream.h>
-#include <wx/except.h>
-
 #include "wxwidgets.h"
 
 #ifdef __WXMAC__

Modified: trunk/drivers/wxwidgets_agg.cpp
===================================================================
--- trunk/drivers/wxwidgets_agg.cpp	2009-03-11 05:28:45 UTC (rev 9714)
+++ trunk/drivers/wxwidgets_agg.cpp	2009-03-11 14:33:48 UTC (rev 9715)
@@ -24,15 +24,15 @@
  *   is commented out, since there are problems with the affine transformation 
  */
 
+/* wxwidgets headers */
+#include <wx/wx.h>
+#include <wx/strconv.h>
+
 #include "plDevs.h"
 
 /* plplot headers */
 #include "plplotP.h"
 #include "plfci-truetype.h"
-
-/* wxwidgets headers */
-#include <wx/wx.h>
-#include <wx/strconv.h>
    
 /* std and driver headers */
 #include "wxwidgets.h"

Modified: trunk/drivers/wxwidgets_app.cpp
===================================================================
--- trunk/drivers/wxwidgets_app.cpp	2009-03-11 05:28:45 UTC (rev 9714)
+++ trunk/drivers/wxwidgets_app.cpp	2009-03-11 14:33:48 UTC (rev 9715)
@@ -23,6 +23,8 @@
  * - Add dialog to get width and height from user for plot size to save.
  */
 
+/* wxwidgets headers */
+#include "wx/wx.h"
 
 #include "plDevs.h"
 
@@ -33,9 +35,6 @@
 #include "drivers.h"
 #include "plevent.h"
 
-/* wxwidgets headers */
-#include "wx/wx.h"
-    
 /* std and driver headers */
 #include "wxwidgets.h"
 

Modified: trunk/drivers/wxwidgets_dc.cpp
===================================================================
--- trunk/drivers/wxwidgets_dc.cpp	2009-03-11 05:28:45 UTC (rev 9714)
+++ trunk/drivers/wxwidgets_dc.cpp	2009-03-11 14:33:48 UTC (rev 9715)
@@ -26,14 +26,14 @@
  * - implement AddToClipRegion for text correctly
  */
 
+/* wxwidgets headers */
+#include <wx/wx.h>
+
 #include "plDevs.h"
 
 /* plplot headers */
 #include "plplotP.h"
 
-/* wxwidgets headers */
-#include <wx/wx.h>
-    
 /* std and driver headers */
 #include <cmath>
 #include "wxwidgets.h"

Modified: trunk/drivers/wxwidgets_gc.cpp
===================================================================
--- trunk/drivers/wxwidgets_gc.cpp	2009-03-11 05:28:45 UTC (rev 9714)
+++ trunk/drivers/wxwidgets_gc.cpp	2009-03-11 14:33:48 UTC (rev 9715)
@@ -25,14 +25,14 @@
  * - implement AddToClipRegion for text correctly
  */
 
+/* wxwidgets headers */
+#include <wx/wx.h>
+
 #include "plDevs.h"
 
 /* plplot headers */
 #include "plplotP.h"
 
-/* wxwidgets headers */
-#include <wx/wx.h>
-
 /* std and driver headers */
 #include "wxwidgets.h"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.