+/////////////////////////////////////////////////////////////////////////////
+// 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_
-#if defined(__PALMOS__)
+#include "wx/defs.h"
+
+#if defined(__WXPALMOS__)
#include "wx/palmos/pen.h"
#elif defined(__WXMSW__)
#include "wx/msw/pen.h"
#elif defined(__WXMOTIF__) || defined(__WXX11__)
#include "wx/x11/pen.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
#include "wx/gtk/pen.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/pen.h"
#elif defined(__WXMGL__)
#include "wx/mgl/pen.h"
+#elif defined(__WXDFB__)
+#include "wx/dfb/pen.h"
#elif defined(__WXMAC__)
#include "wx/mac/pen.h"
#elif defined(__WXCOCOA__)