don't pass NULL pointer to printf(), this crashes Solaris printf

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

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 97da9143a8f8d548d1e0c39a85574d7d4bb94e11..239642819a6c15526e9e765e8002db460afec7d0 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -1,15 +1,34 @@
-#ifndef __PENH_BASE__
-#define __PENH_BASE__
+/////////////////////////////////////////////////////////////////////////////
+// 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
+/////////////////////////////////////////////////////////////////////////////

 
 

-#if defined(__WXMSW__)
+#ifndef _WX_PEN_H_BASE_
+#define _WX_PEN_H_BASE_
+
+#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/xt/pen.h"
+#elif defined(__WXMOTIF__) || defined(__WXX11__)
+#include "wx/x11/pen.h"

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

-#elif defined(__WXQT__)
-#include "wx/qt/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"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __PENH_BASE__
+    // _WX_PEN_H_BASE_