move wxWindowGTK::DoPopupMenu back to window.cpp

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

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 2582ae406d320b85c75bdfbf1094c9471f79d3c5..341530ef16e31606aea02bb70280a4617c2c1e83 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -12,7 +12,12 @@
 #ifndef _WX_PEN_H_BASE_
 #define _WX_PEN_H_BASE_
 
-#include "wx/defs.h"
+#include "wx/gdiobj.h"
+#include "wx/gdicmn.h"
+
+#if WXWIN_COMPATIBILITY_2_8
+#include "wx/brush.h"       // needed for some deprecated declarations
+#endif
 
 enum wxPenStyle
 {
@@ -31,7 +36,7 @@ enum wxPenStyle
     wxPENSTYLE_LONG_DASH = wxLONG_DASH,
     wxPENSTYLE_SHORT_DASH = wxSHORT_DASH,
     wxPENSTYLE_DOT_DASH = wxDOT_DASH,
-    wxPENSTYLE_USER_DOT = wxUSER_DASH,
+    wxPENSTYLE_USER_DASH = wxUSER_DASH,
 
     wxPENSTYLE_TRANSPARENT = wxTRANSPARENT,
 
@@ -56,7 +61,7 @@ enum wxPenStyle
     wxPENSTYLE_LONG_DASH,
     wxPENSTYLE_SHORT_DASH,
     wxPENSTYLE_DOT_DASH,
-    wxPENSTYLE_USER_DOT,
+    wxPENSTYLE_USER_DASH,
 
     wxPENSTYLE_TRANSPARENT,