fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

[wxWidgets.git] / include / wx / pen.h

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 5cef9c390e9a6d58af81e94a878caaf9803709e7..539d4f7531d47e24cbb03bc45a0df5ea16fb159f 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -1,20 +1,37 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/pen.h
+// Purpose:     Base header for wxPen
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_PEN_H_BASE_
 #define _WX_PEN_H_BASE_
 
 #ifndef _WX_PEN_H_BASE_
 #define _WX_PEN_H_BASE_
 

-#if defined(__WXMSW__)
+#include "wx/defs.h"
+
+#if defined(__WXPALMOS__)
+#include "wx/palmos/pen.h"
+#elif defined(__WXMSW__)

 #include "wx/msw/pen.h"
 #include "wx/msw/pen.h"

-#elif defined(__WXMOTIF__)
-#include "wx/motif/pen.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXMOTIF__) || defined(__WXX11__)
+#include "wx/x11/pen.h"
+#elif defined(__WXGTK20__)

 #include "wx/gtk/pen.h"
 #include "wx/gtk/pen.h"

+#elif defined(__WXGTK__)
+#include "wx/gtk1/pen.h"

 #elif defined(__WXMGL__)
 #include "wx/mgl/pen.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/pen.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/pen.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/pen.h"

+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/pen.h"

 #elif defined(__WXPM__)
 #include "wx/os2/pen.h"
 #elif defined(__WXPM__)
 #include "wx/os2/pen.h"

-#elif defined(__WXSTUBS__)
-#include "wx/stubs/pen.h"

 #endif
 
 #endif
 #endif
 
 #endif