fixed bug in DeleteEntry()

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 5cc489ac20eaab28dd337a730b0ceab6fcb6b395..1057dc55ed63520f0a5769dbdad0a863ad6e76b0 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -16,17 +16,14 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "gdicmn.h"
 #endif
 
     #pragma interface "gdicmn.h"
 #endif
 

-#include "wx/object.h"
+#include "wx/setup.h"

 #include "wx/list.h"
 #include "wx/list.h"

-#include "wx/hash.h"

 #include "wx/string.h"
 #include "wx/string.h"

-#include "wx/setup.h"
-#include "wx/colour.h"
-#include "wx/font.h"
+#include "wx/fontenc.h"

 
 // ---------------------------------------------------------------------------
 // forward declarations
 
 // ---------------------------------------------------------------------------
 // forward declarations


@@ -78,6 +75,8 @@ enum wxBitmapType
     wxBITMAP_TYPE_PICT_RESOURCE,
     wxBITMAP_TYPE_ICON,
     wxBITMAP_TYPE_ICON_RESOURCE,
     wxBITMAP_TYPE_PICT_RESOURCE,
     wxBITMAP_TYPE_ICON,
     wxBITMAP_TYPE_ICON_RESOURCE,

+    wxBITMAP_TYPE_ANI,
+    wxBITMAP_TYPE_IFF,

     wxBITMAP_TYPE_MACCURSOR,
     wxBITMAP_TYPE_MACCURSOR_RESOURCE,
     wxBITMAP_TYPE_ANY = 50
     wxBITMAP_TYPE_MACCURSOR,
     wxBITMAP_TYPE_MACCURSOR_RESOURCE,
     wxBITMAP_TYPE_ANY = 50


@@ -88,6 +87,7 @@ enum wxStockCursor
 {
     wxCURSOR_NONE,          // should be 0
     wxCURSOR_ARROW,
 {
     wxCURSOR_NONE,          // should be 0
     wxCURSOR_ARROW,

+    wxCURSOR_RIGHT_ARROW,

     wxCURSOR_BULLSEYE,
     wxCURSOR_CHAR,
     wxCURSOR_CROSS,
     wxCURSOR_BULLSEYE,
     wxCURSOR_CHAR,
     wxCURSOR_CROSS,


@@ -115,6 +115,9 @@ enum wxStockCursor
 #ifdef __WXGTK__
     wxCURSOR_DEFAULT, // standard X11 cursor
 #endif
 #ifdef __WXGTK__
     wxCURSOR_DEFAULT, // standard X11 cursor
 #endif

+#ifdef __WXMAC__
+       wxCURSOR_COPY_ARROW , // MacOS Theme Plus arrow 
+#endif

 #ifdef __X__
     // Not yet implemented for Windows
     wxCURSOR_CROSS_REVERSE,
 #ifdef __X__
     // Not yet implemented for Windows
     wxCURSOR_CROSS_REVERSE,


@@ -148,19 +151,28 @@ enum wxStockCursor
 
 #ifdef __WXMSW__
     // Load from a resource
 
 #ifdef __WXMSW__
     // Load from a resource

-    #define wxICON(X) wxIcon("" #X "")
+    #define wxICON(X) wxIcon(wxT(#X))

 #elif defined(__WXPM__)
     // Load from a resource
 #elif defined(__WXPM__)
     // Load from a resource

-    #define wxICON(X) wxIcon("" #X "")
+    #define wxICON(X) wxIcon(wxT(#X))
+#elif defined(__WXMGL__)
+    // Initialize from an included XPM
+    #define wxICON(X) wxIcon( (const char**) X##_xpm )

 #elif defined(__WXGTK__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( (const char**) X##_xpm )
 #elif defined(__WXGTK__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( (const char**) X##_xpm )

+#elif defined(__WXMAC__)
+    // Initialize from an included XPM
+    #define wxICON(X) wxIcon( (const char**) X##_xpm )

 #elif defined(__WXMOTIF__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( X##_xpm )
 #elif defined(__WXMOTIF__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( X##_xpm )

+#elif defined(__WXX11__)
+    // Initialize from an included XPM
+    #define wxICON(X) wxIcon( X##_xpm )

 #else
     // This will usually mean something on any platform
 #else
     // This will usually mean something on any platform

-    #define wxICON(X) wxIcon("" #X "")
+    #define wxICON(X) wxIcon(wxT(#X))

 #endif // platform
 
 /* Another macro: this one is for portable creation of bitmaps. We assume that
 #endif // platform
 
 /* Another macro: this one is for portable creation of bitmaps. We assume that


@@ -168,8 +180,8 @@ enum wxStockCursor
  */
 
 #if defined(__WXMSW__) || defined(__WXPM__)
  */
 
 #if defined(__WXMSW__) || defined(__WXPM__)

-    #define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE)
-#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+    #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_RESOURCE)
+#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXCOCOA__)

     // Initialize from an included XPM
     #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
 #else // other platforms
     // Initialize from an included XPM
     #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
 #else // other platforms


@@ -183,24 +195,30 @@ enum wxStockCursor
 // ---------------------------------------------------------------------------
 // wxSize
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxSize
 // ---------------------------------------------------------------------------

+

 class WXDLLEXPORT wxSize
 {
 public:
 class WXDLLEXPORT wxSize
 {
 public:

-    // members are public for compatibility (don't use them directly,
-    // especially that there names were chosen very unfortunately - they should
-    // have been called width and height)
+    // members are public for compatibility, don't use them directly.

     int x, y;
 
     // constructors
     int x, y;
 
     // constructors

-    wxSize() { x = y = 0; }
-    wxSize(int xx, int yy) { Set(xx, yy); }
+    wxSize() : x(0), y(0) { }
+    wxSize(int xx, int yy) : x(xx), y(yy) { }

 
     // no copy ctor or assignment operator - the defaults are ok
 
     // no copy ctor or assignment operator - the defaults are ok

+

     bool operator==(const wxSize& sz) const { return x == sz.x && y == sz.y; }
     bool operator==(const wxSize& sz) const { return x == sz.x && y == sz.y; }

+    bool operator!=(const wxSize& sz) const { return x != sz.x || y != sz.y; }

 
     // FIXME are these really useful? If they're, we should have += &c as well
     wxSize operator+(const wxSize& sz) { return wxSize(x + sz.x, y + sz.y); }
     wxSize operator-(const wxSize& sz) { return wxSize(x - sz.x, y - sz.y); }
 
     // FIXME are these really useful? If they're, we should have += &c as well
     wxSize operator+(const wxSize& sz) { return wxSize(x + sz.x, y + sz.y); }
     wxSize operator-(const wxSize& sz) { return wxSize(x - sz.x, y - sz.y); }

+    
+    void IncTo(const wxSize& sz)
+        { if ( sz.x > x ) x = sz.x; if ( sz.y > y ) y = sz.y; }
+    void DecTo(const wxSize& sz)
+        { if ( sz.x < x ) x = sz.x; if ( sz.y < y ) y = sz.y; }

 
     // accessors
     void Set(int xx, int yy) { x = xx; y = yy; }
 
     // accessors
     void Set(int xx, int yy) { x = xx; y = yy; }


@@ -225,13 +243,14 @@ public:
     double x;
     double y;
 
     double x;
     double y;
 

-    wxRealPoint() { x = y = 0.0; };
-    wxRealPoint(double xx, double yy) { x = xx; y = yy; };
+    wxRealPoint() : x(0.0), y(0.0) { }
+    wxRealPoint(double xx, double yy) : x(xx), y(yy) { }

 
     wxRealPoint operator+(const wxRealPoint& pt) const { return wxRealPoint(x + pt.x, y + pt.y); }
     wxRealPoint operator-(const wxRealPoint& pt) const { return wxRealPoint(x - pt.x, y - pt.y); }
 
     bool operator==(const wxRealPoint& pt) const { return x == pt.x && y == pt.y; }
 
     wxRealPoint operator+(const wxRealPoint& pt) const { return wxRealPoint(x + pt.x, y + pt.y); }
     wxRealPoint operator-(const wxRealPoint& pt) const { return wxRealPoint(x - pt.x, y - pt.y); }
 
     bool operator==(const wxRealPoint& pt) const { return x == pt.x && y == pt.y; }

+    bool operator!=(const wxRealPoint& pt) const { return x != pt.x || y != pt.y; }

 };
 
 class WXDLLEXPORT wxPoint
 };
 
 class WXDLLEXPORT wxPoint


@@ -239,8 +258,8 @@ class WXDLLEXPORT wxPoint
 public:
     int x, y;
 
 public:
     int x, y;
 

-    wxPoint() { x = y = 0; };
-    wxPoint(int xx, int yy) { x = xx; y = yy; };
+    wxPoint() : x(0), y(0) { }
+    wxPoint(int xx, int yy) : x(xx), y(yy) { }

 
     // no copy ctor or assignment operator - the defaults are ok
 
 
     // no copy ctor or assignment operator - the defaults are ok
 


@@ -256,11 +275,6 @@ public:
     wxPoint& operator-=(const wxPoint& p) { x -= p.x; y -= p.y; return *this; }
 };
 
     wxPoint& operator-=(const wxPoint& p) { x -= p.x; y -= p.y; return *this; }
 };
 

-#if WXWIN_COMPATIBILITY
-    #define wxIntPoint wxPoint
-    #define wxRectangle wxRect
-#endif // WXWIN_COMPATIBILITY
-

 // ---------------------------------------------------------------------------
 // wxRect
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxRect
 // ---------------------------------------------------------------------------


@@ -268,9 +282,12 @@ public:
 class WXDLLEXPORT wxRect
 {
 public:
 class WXDLLEXPORT wxRect
 {
 public:

-    wxRect() { x = y = width = height = 0; }
+    wxRect()
+        : x(0), y(0), width(0), height(0)
+        { }

     wxRect(int xx, int yy, int ww, int hh)
     wxRect(int xx, int yy, int ww, int hh)

-        { x = xx; y = yy; width = ww; height = hh; }
+        : x(xx), y(yy), width(ww), height(hh)
+        { }

     wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRect(const wxPoint& pos, const wxSize& size);
 
     wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRect(const wxPoint& pos, const wxSize& size);
 


@@ -289,7 +306,10 @@ public:
     void SetHeight(int h) { height = h; }
 
     wxPoint GetPosition() const { return wxPoint(x, y); }
     void SetHeight(int h) { height = h; }
 
     wxPoint GetPosition() const { return wxPoint(x, y); }

+    void SetPosition( const wxPoint &p ) { x = p.x; y = p.y; }
+

     wxSize GetSize() const { return wxSize(width, height); }
     wxSize GetSize() const { return wxSize(width, height); }

+    void SetSize( const wxSize &s ) { width = s.GetWidth(); height = s.GetHeight(); }

 
     int GetLeft()   const { return x; }
     int GetTop()    const { return y; }
 
     int GetLeft()   const { return x; }
     int GetTop()    const { return y; }


@@ -301,23 +321,49 @@ public:
     void SetTop(int top) { y = top; }
     void SetBottom(int bottom) { height = bottom - y + 1; }
 
     void SetTop(int top) { y = top; }
     void SetBottom(int bottom) { height = bottom - y + 1; }
 

-    void Inflate(wxCoord dx, wxCoord dy)
+    // operations with rect
+    wxRect& Inflate(wxCoord dx, wxCoord dy);
+    wxRect& Inflate(wxCoord d) { return Inflate(d, d); }
+    wxRect Inflate(wxCoord dx, wxCoord dy) const

     {
     {

-        x -= dx;
-        y -= dy;
-        width += 2*dx;
-        height += 2*dy;
+        wxRect r = *this;
+        r.Inflate(dx, dy);
+        return r;

     }
 
     }
 

-    void Inflate(wxCoord d) { Inflate(d, d); }
+    wxRect& Deflate(wxCoord dx, wxCoord dy) { return Inflate(-dx, -dy); }
+    wxRect& Deflate(wxCoord d) { return Inflate(-d); }
+    wxRect Deflate(wxCoord dx, wxCoord dy) const
+    {
+        wxRect r = *this;
+        r.Deflate(dx, dy);
+        return r;
+    }
+
+    void Offset(wxCoord dx, wxCoord dy) { x += dx; y += dy; }
+    void Offset(const wxPoint& pt) { Offset(pt.x, pt.y); }
+
+    wxRect& Intersect(const wxRect& rect);
+    wxRect Intersect(const wxRect& rect) const
+    {
+        wxRect r = *this;
+        r.Intersect(rect);
+        return r;
+    }

 
 

+    wxRect operator+(const wxRect& rect) const;
+    wxRect& operator+=(const wxRect& rect);
+
+    // compare rectangles

     bool operator==(const wxRect& rect) const;
     bool operator!=(const wxRect& rect) const { return !(*this == rect); }
 
     bool operator==(const wxRect& rect) const;
     bool operator!=(const wxRect& rect) const { return !(*this == rect); }
 

-    bool Inside(int cx, int cy) const;
+    // return TRUE if the point is (not strcitly) inside the rect
+    bool Inside(int x, int y) const;

     bool Inside(const wxPoint& pt) const { return Inside(pt.x, pt.y); }
     bool Inside(const wxPoint& pt) const { return Inside(pt.x, pt.y); }

-    wxRect operator+(const wxRect& rect) const;
-    wxRect& operator+=(const wxRect& rect);
+
+    // return TRUE if the rectangles have a non empty intersection
+    bool Intersects(const wxRect& rect) const;

 
 public:
     int x, y, width, height;
 
 public:
     int x, y, width, height;


@@ -331,8 +377,6 @@ typedef wxInt8 wxDash;
 
 class WXDLLEXPORT wxPenList : public wxList
 {
 
 class WXDLLEXPORT wxPenList : public wxList
 {

-    DECLARE_DYNAMIC_CLASS(wxPenList)
-

 public:
     wxPenList() { }
     ~wxPenList();
 public:
     wxPenList() { }
     ~wxPenList();


@@ -344,8 +388,6 @@ public:
 
 class WXDLLEXPORT wxBrushList : public wxList
 {
 
 class WXDLLEXPORT wxBrushList : public wxList
 {

-    DECLARE_DYNAMIC_CLASS(wxBrushList)
-

 public:
     wxBrushList() { }
     ~wxBrushList();
 public:
     wxBrushList() { }
     ~wxBrushList();


@@ -355,12 +397,8 @@ public:
     wxBrush *FindOrCreateBrush(const wxColour& colour, int style);
 };
 
     wxBrush *FindOrCreateBrush(const wxColour& colour, int style);
 };
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
-

 class WXDLLEXPORT wxFontList : public wxList
 {
 class WXDLLEXPORT wxFontList : public wxList
 {

-    DECLARE_DYNAMIC_CLASS(wxFontList)
-

 public:
     wxFontList() { }
     ~wxFontList();
 public:
     wxFontList() { }
     ~wxFontList();


@@ -373,29 +411,33 @@ public:
                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 };
 
                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 };
 

-class WXDLLEXPORT wxColourDatabase : public wxList
-{
-    DECLARE_CLASS(wxColourDatabase)
+class WXDLLEXPORT wxStringToColourHashMap;

 
 

+class WXDLLEXPORT wxColourDatabase
+{

 public:
 public:

-    wxColourDatabase(int type);
+    wxColourDatabase();

     ~wxColourDatabase() ;
 
     // Not const because it may add a name to the database
     wxColour *FindColour(const wxString& colour) ;
     ~wxColourDatabase() ;
 
     // Not const because it may add a name to the database
     wxColour *FindColour(const wxString& colour) ;

+    wxColour *FindColourNoAdd(const wxString& colour) const;

     wxString FindName(const wxColour& colour) const;
     wxString FindName(const wxColour& colour) const;

+    void AddColour(const wxString& name, wxColour* colour);

     void Initialize();
 #ifdef __WXPM__
     // PM keeps its own type of colour table
     long*                           m_palTable;
     size_t                          m_nSize;
 #endif
     void Initialize();
 #ifdef __WXPM__
     // PM keeps its own type of colour table
     long*                           m_palTable;
     size_t                          m_nSize;
 #endif

+private:
+    wxColour* FindColour(const wxString& colour, bool add);
+
+    wxStringToColourHashMap* m_map;

 };
 
 class WXDLLEXPORT wxBitmapList : public wxList
 {
 };
 
 class WXDLLEXPORT wxBitmapList : public wxList
 {

-    DECLARE_DYNAMIC_CLASS(wxBitmapList)
-

 public:
     wxBitmapList();
     ~wxBitmapList();
 public:
     wxBitmapList();
     ~wxBitmapList();


@@ -408,11 +450,10 @@ class WXDLLEXPORT wxResourceCache: public wxList
 {
 public:
     wxResourceCache() { }
 {
 public:
     wxResourceCache() { }

+#if !wxUSE_STL

     wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
     wxResourceCache(const unsigned int keyType) : wxList(keyType) { }

+#endif

     ~wxResourceCache();
     ~wxResourceCache();

-
-private:
-    DECLARE_DYNAMIC_CLASS(wxResourceCache)

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------