move wxWindowGTK::DoPopupMenu back to window.cpp

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

diff --git a/include/wx/brush.h b/include/wx/brush.h
index 69b187b7dc16cead096b4e1dc5550c8026eac6cd..d55ed5c3afe88a76c56e6fefafc818bc13406a6c 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -15,77 +15,48 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdiobj.h"
+#include "wx/gdicmn.h"      // for wxGDIObjListBase
 
 // NOTE: these values cannot be combined together!
 enum wxBrushStyle
 {
-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8
     /* start of deprecated values */
-    wxSOLID      =   100,
-    wxDOT,
-    wxLONG_DASH,
-    wxSHORT_DASH,
-    wxDOT_DASH,
-    wxUSER_DASH,
-    wxTRANSPARENT,
-    wxSTIPPLE_MASK_OPAQUE,
-    wxSTIPPLE_MASK,
-    wxSTIPPLE,
-    wxBDIAGONAL_HATCH,
-    wxCROSSDIAG_HATCH,
-    wxFDIAGONAL_HATCH,
-    wxCROSS_HATCH,
-    wxHORIZONTAL_HATCH,
-    wxVERTICAL_HATCH,
+    wxSOLID = 100,
+    wxTRANSPARENT = 106,
+    wxSTIPPLE_MASK_OPAQUE = 107,
+    wxSTIPPLE_MASK = 108,
+    wxSTIPPLE = 109,
+    wxBDIAGONAL_HATCH = 110,
+    wxCROSSDIAG_HATCH = 111,
+    wxFDIAGONAL_HATCH = 112,
+    wxCROSS_HATCH = 113,
+    wxHORIZONTAL_HATCH = 114,
+    wxVERTICAL_HATCH = 115,
     wxFIRST_HATCH = wxBDIAGONAL_HATCH,
     wxLAST_HATCH = wxVERTICAL_HATCH,
     /* end of deprecated values */
 
     wxBRUSHSTYLE_SOLID = wxSOLID,
-    wxBRUSHSTYLE_DOT = wxDOT,
-    wxBRUSHSTYLE_LONG_DASH = wxLONG_DASH,
-    wxBRUSHSTYLE_SHORT_DASH = wxSHORT_DASH,
-    wxBRUSHSTYLE_DOT_DASH = wxDOT_DASH,
-    wxBRUSHSTYLE_USER_DOT = wxUSER_DASH,
-
     wxBRUSHSTYLE_TRANSPARENT = wxTRANSPARENT,
-
-    /*  Brush Stippling. */
     wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE = wxSTIPPLE_MASK_OPAQUE,
-        /* mask is used for blitting monochrome using text fore and back ground colors */
-
     wxBRUSHSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK,
-        /* mask is used for masking areas in the stipple bitmap (TO DO) */
-
     wxBRUSHSTYLE_STIPPLE = wxSTIPPLE,
-        /*  drawn with a Pen, and without any Brush -- and it can be stippled. */
-
-    /* In wxWidgets < 2.6 use WX_HATCH macro  */
-    /* to verify these wx*_HATCH are in style */
-    /* of wxBrush. In wxWidgets >= 2.6 use    */
-    /* wxBrush::IsHatch() instead.            */
     wxBRUSHSTYLE_BDIAGONAL_HATCH = wxBDIAGONAL_HATCH,
     wxBRUSHSTYLE_CROSSDIAG_HATCH = wxCROSSDIAG_HATCH,
     wxBRUSHSTYLE_FDIAGONAL_HATCH = wxFDIAGONAL_HATCH,
     wxBRUSHSTYLE_CROSS_HATCH = wxCROSS_HATCH,
     wxBRUSHSTYLE_HORIZONTAL_HATCH = wxHORIZONTAL_HATCH,
     wxBRUSHSTYLE_VERTICAL_HATCH = wxVERTICAL_HATCH,
-
     wxBRUSHSTYLE_FIRST_HATCH = wxFIRST_HATCH,
     wxBRUSHSTYLE_LAST_HATCH = wxLAST_HATCH,
-
     wxBRUSHSTYLE_MAX
 #else
     wxBRUSHSTYLE_SOLID,
-    wxBRUSHSTYLE_DOT,
-    wxBRUSHSTYLE_LONG_DASH,
-    wxBRUSHSTYLE_SHORT_DASH,
-    wxBRUSHSTYLE_DOT_DASH,
-    wxBRUSHSTYLE_USER_DOT,
-
     wxBRUSHSTYLE_TRANSPARENT,
 
     /*  Brush Stippling. */
+
     wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE,
         /* mask is used for blitting monochrome using text fore and back ground colors */
 
@@ -148,5 +119,17 @@ public:
     #include "wx/os2/brush.h"
 #endif
 
+class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase
+{
+public:
+    wxBrush *FindOrCreateBrush(const wxColour& colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
+#if WXWIN_COMPATIBILITY_2_6
+    wxDEPRECATED( void AddBrush(wxBrush*) );
+    wxDEPRECATED( void RemoveBrush(wxBrush*) );
+#endif
+};
+
+extern WXDLLEXPORT_DATA(wxBrushList*)   wxTheBrushList;
+
 #endif
     // _WX_BRUSH_H_BASE_