X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e418ffc1002c514f0e3e876809c33ae9ad8695b..edccf4281bc8fbb9d8151240ba5b208339c9ac11:/src/common/gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index eae3619cec..53a1a34117 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -30,6 +30,8 @@
 #include "wx/font.h"
 #include "wx/palette.h"
 #include "wx/app.h"
+#include "wx/dc.h"
+#include "wx/utils.h"
 
 #include "wx/log.h"
 #include <string.h>
@@ -43,29 +45,16 @@
 #endif
 
 #if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxColourDatabase, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
-/*
-IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPoint, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxRealPoint, wxObject)
-*/
+    IMPLEMENT_CLASS(wxColourDatabase, wxList)
+    IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
+    IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
+    IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
+    IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
+    IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
+
+    IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
 #endif
 
-wxRect::wxRect()
-{
-    x = 0; y = 0; width = 0; height = 0;
-}
-
-wxRect::wxRect(long xx, long yy, long w, long h)
-{
-    x = xx; y = yy; width = w; height = h;
-}
-
 wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
   x = topLeft.x;
@@ -92,21 +81,7 @@ wxRect::wxRect(const wxPoint& point, const wxSize& size)
     width = size.x; height = size.y;
 }
 
-wxRect::wxRect(const wxRect& rect)
-{
-    x = rect.x;
-    y = rect.y;
-    width = rect.width;
-    height = rect.height;
-}
-
-wxRect& wxRect::operator = (const wxRect& rect)
-{
-    x = rect.x; y = rect.y; width = rect.width; height = rect.height;
-    return *this;
-}
-
-bool wxRect::operator == (const wxRect& rect)
+bool wxRect::operator==(const wxRect& rect) const
 {
   return ((x == rect.x) &&
           (y == rect.y) &&
@@ -114,16 +89,30 @@ bool wxRect::operator == (const wxRect& rect)
           (height == rect.height));
 }
 
-bool wxRect::operator != (const wxRect& rect)
+const wxRect& wxRect::operator += (const wxRect& rect)
+{ 
+	*this = (*this + rect); 
+	return ( *this ) ;
+}
+
+wxRect wxRect::operator + (const wxRect& rect) const
+{ 
+	int x1 = wxMin(this->x, rect.x);
+	int y1 = wxMin(this->y, rect.y);
+	int y2 = wxMax(y+height, rect.height+rect.y);
+	int x2 = wxMax(x+width, rect.width+rect.x);
+	return wxRect(x1, y1, x2-x1, y2-y1);
+}
+
+bool wxRect::Inside(int cx, int cy) const
 {
-  return ((x != rect.x) ||
-          (y != rect.y) ||
-          (width != rect.width) ||
-          (height != rect.height));
+	return ( (cx >= x) && (cy >= y)
+		  && ((cy - y) < height)
+		  && ((cx - x) < width)
+		  );
 }
 
-wxColourDatabase::wxColourDatabase (int type):
-wxList (type)
+wxColourDatabase::wxColourDatabase (int type) : wxList (type)
 {
 }
 
@@ -148,91 +137,91 @@ void wxColourDatabase::Initialize ()
   // Added: Not all
 
   struct cdef {
-   char *name;
+   wxChar *name;
    int r,g,b;
   };
   cdef cc;
   static cdef table[]={
 
 // #ifdef __WXMSW__
-   {"AQUAMARINE",112, 219, 147},
-   {"BLACK",0, 0, 0},
-   {"BLUE", 0, 0, 255},
-   {"BLUE VIOLET", 159, 95, 159},
-   {"BROWN", 165, 42, 42},
-   {"CADET BLUE", 95, 159, 159},
-   {"CORAL", 255, 127, 0},
-   {"CORNFLOWER BLUE", 66, 66, 111},
-   {"CYAN", 0, 255, 255},
-   {"DARK GREY", 47, 47, 47},   // ?
-
-   {"DARK GREEN", 47, 79, 47},
-   {"DARK OLIVE GREEN", 79, 79, 47},
-   {"DARK ORCHID", 153, 50, 204},
-   {"DARK SLATE BLUE", 107, 35, 142},
-   {"DARK SLATE GREY", 47, 79, 79},
-   {"DARK TURQUOISE", 112, 147, 219},
-   {"DIM GREY", 84, 84, 84},
-   {"FIREBRICK", 142, 35, 35},
-   {"FOREST GREEN", 35, 142, 35},
-   {"GOLD", 204, 127, 50},
-   {"GOLDENROD", 219, 219, 112},
-   {"GREY", 128, 128, 128},
-   {"GREEN", 0, 255, 0},
-   {"GREEN YELLOW", 147, 219, 112},
-   {"INDIAN RED", 79, 47, 47},
-   {"KHAKI", 159, 159, 95},
-   {"LIGHT BLUE", 191, 216, 216},
-   {"LIGHT GREY", 192, 192, 192},
-   {"LIGHT STEEL BLUE", 143, 143, 188},
-   {"LIME GREEN", 50, 204, 50},
-   {"LIGHT MAGENTA", 255, 0, 255},
-   {"MAGENTA", 255, 0, 255},
-   {"MAROON", 142, 35, 107},
-   {"MEDIUM AQUAMARINE", 50, 204, 153},
-   {"MEDIUM GREY", 100, 100, 100},
-   {"MEDIUM BLUE", 50, 50, 204},
-   {"MEDIUM FOREST GREEN", 107, 142, 35},
-   {"MEDIUM GOLDENROD", 234, 234, 173},
-   {"MEDIUM ORCHID", 147, 112, 219},
-   {"MEDIUM SEA GREEN", 66, 111, 66},
-   {"MEDIUM SLATE BLUE", 127, 0, 255},
-   {"MEDIUM SPRING GREEN", 127, 255, 0},
-   {"MEDIUM TURQUOISE", 112, 219, 219},
-   {"MEDIUM VIOLET RED", 219, 112, 147},
-   {"MIDNIGHT BLUE", 47, 47, 79},
-   {"NAVY", 35, 35, 142},
-   {"ORANGE", 204, 50, 50},
-   {"ORANGE RED", 255, 0, 127},
-   {"ORCHID", 219, 112, 219},
-   {"PALE GREEN", 143, 188, 143},
-   {"PINK", 188, 143, 234},
-   {"PLUM", 234, 173, 234},
-   {"PURPLE", 176, 0, 255},
-   {"RED", 255, 0, 0},
-   {"SALMON", 111, 66, 66},
-   {"SEA GREEN", 35, 142, 107},
-   {"SIENNA", 142, 107, 35},
-   {"SKY BLUE", 50, 153, 204},
-   {"SLATE BLUE", 0, 127, 255},
-   {"SPRING GREEN", 0, 255, 127},
-   {"STEEL BLUE", 35, 107, 142},
-   {"TAN", 219, 147, 112},
-   {"THISTLE", 216, 191, 216},
-   {"TURQUOISE", 173, 234, 234},
-   {"VIOLET", 79, 47, 79},
-   {"VIOLET RED", 204, 50, 153},
-   {"WHEAT", 216, 216, 191},
-   {"WHITE", 255, 255, 255},
-   {"YELLOW", 255, 255, 0},
-   {"YELLOW GREEN", 153, 204, 50},
+   {_T("AQUAMARINE"),112, 219, 147},
+   {_T("BLACK"),0, 0, 0},
+   {_T("BLUE"), 0, 0, 255},
+   {_T("BLUE VIOLET"), 159, 95, 159},
+   {_T("BROWN"), 165, 42, 42},
+   {_T("CADET BLUE"), 95, 159, 159},
+   {_T("CORAL"), 255, 127, 0},
+   {_T("CORNFLOWER BLUE"), 66, 66, 111},
+   {_T("CYAN"), 0, 255, 255},
+   {_T("DARK GREY"), 47, 47, 47},   // ?
+
+   {_T("DARK GREEN"), 47, 79, 47},
+   {_T("DARK OLIVE GREEN"), 79, 79, 47},
+   {_T("DARK ORCHID"), 153, 50, 204},
+   {_T("DARK SLATE BLUE"), 107, 35, 142},
+   {_T("DARK SLATE GREY"), 47, 79, 79},
+   {_T("DARK TURQUOISE"), 112, 147, 219},
+   {_T("DIM GREY"), 84, 84, 84},
+   {_T("FIREBRICK"), 142, 35, 35},
+   {_T("FOREST GREEN"), 35, 142, 35},
+   {_T("GOLD"), 204, 127, 50},
+   {_T("GOLDENROD"), 219, 219, 112},
+   {_T("GREY"), 128, 128, 128},
+   {_T("GREEN"), 0, 255, 0},
+   {_T("GREEN YELLOW"), 147, 219, 112},
+   {_T("INDIAN RED"), 79, 47, 47},
+   {_T("KHAKI"), 159, 159, 95},
+   {_T("LIGHT BLUE"), 191, 216, 216},
+   {_T("LIGHT GREY"), 192, 192, 192},
+   {_T("LIGHT STEEL BLUE"), 143, 143, 188},
+   {_T("LIME GREEN"), 50, 204, 50},
+   {_T("LIGHT MAGENTA"), 255, 0, 255},
+   {_T("MAGENTA"), 255, 0, 255},
+   {_T("MAROON"), 142, 35, 107},
+   {_T("MEDIUM AQUAMARINE"), 50, 204, 153},
+   {_T("MEDIUM GREY"), 100, 100, 100},
+   {_T("MEDIUM BLUE"), 50, 50, 204},
+   {_T("MEDIUM FOREST GREEN"), 107, 142, 35},
+   {_T("MEDIUM GOLDENROD"), 234, 234, 173},
+   {_T("MEDIUM ORCHID"), 147, 112, 219},
+   {_T("MEDIUM SEA GREEN"), 66, 111, 66},
+   {_T("MEDIUM SLATE BLUE"), 127, 0, 255},
+   {_T("MEDIUM SPRING GREEN"), 127, 255, 0},
+   {_T("MEDIUM TURQUOISE"), 112, 219, 219},
+   {_T("MEDIUM VIOLET RED"), 219, 112, 147},
+   {_T("MIDNIGHT BLUE"), 47, 47, 79},
+   {_T("NAVY"), 35, 35, 142},
+   {_T("ORANGE"), 204, 50, 50},
+   {_T("ORANGE RED"), 255, 0, 127},
+   {_T("ORCHID"), 219, 112, 219},
+   {_T("PALE GREEN"), 143, 188, 143},
+   {_T("PINK"), 188, 143, 234},
+   {_T("PLUM"), 234, 173, 234},
+   {_T("PURPLE"), 176, 0, 255},
+   {_T("RED"), 255, 0, 0},
+   {_T("SALMON"), 111, 66, 66},
+   {_T("SEA GREEN"), 35, 142, 107},
+   {_T("SIENNA"), 142, 107, 35},
+   {_T("SKY BLUE"), 50, 153, 204},
+   {_T("SLATE BLUE"), 0, 127, 255},
+   {_T("SPRING GREEN"), 0, 255, 127},
+   {_T("STEEL BLUE"), 35, 107, 142},
+   {_T("TAN"), 219, 147, 112},
+   {_T("THISTLE"), 216, 191, 216},
+   {_T("TURQUOISE"), 173, 234, 234},
+   {_T("VIOLET"), 79, 47, 79},
+   {_T("VIOLET RED"), 204, 50, 153},
+   {_T("WHEAT"), 216, 216, 191},
+   {_T("WHITE"), 255, 255, 255},
+   {_T("YELLOW"), 255, 255, 0},
+   {_T("YELLOW GREEN"), 153, 204, 50},
 // #endif
 
 #if defined(__WXGTK__) || defined(__X__)
-   {"MEDIUM GOLDENROD", 234, 234, 173},
-   {"MEDIUM FOREST GREEN", 107, 142, 35},
-   {"LIGHT MAGENTA", 255, 0, 255},
-   {"MEDIUM GREY", 100, 100, 100},
+   {_T("MEDIUM GOLDENROD"), 234, 234, 173},
+   {_T("MEDIUM FOREST GREEN"), 107, 142, 35},
+   {_T("LIGHT MAGENTA"), 255, 0, 255},
+   {_T("MEDIUM GREY"), 100, 100, 100},
 #endif
 
    {0,0,0,0}
@@ -321,23 +310,29 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 
 wxString wxColourDatabase::FindName (const wxColour& colour) const
 {
-  unsigned char red = colour.Red ();
-  unsigned char green = colour.Green ();
-  unsigned char blue = colour.Blue ();
+    wxString name;
 
-  for (wxNode * node = First (); node; node = node->Next ())
-  {
-      wxColour *col = (wxColour *) node->Data ();
+    unsigned char red = colour.Red ();
+    unsigned char green = colour.Green ();
+    unsigned char blue = colour.Blue ();
+
+    for (wxNode * node = First (); node; node = node->Next ())
+    {
+        wxColour *col = (wxColour *) node->Data ();
 
-      if (col->Red () == red && col->Green () == green && col->Blue () == blue)
+        if (col->Red () == red && col->Green () == green && col->Blue () == blue)
         {
-          const char *found = node->GetKeyString();
-          if (found)
-            return wxString(found);
+            const wxChar *found = node->GetKeyString();
+            if ( found )
+            {
+                name = found;
+
+                break;
+            }
         }
-  }
-  return wxString("");                        // Not Found
+    }
 
+    return name;
 }
 
 void wxInitializeStockLists () {
@@ -601,7 +596,7 @@ wxFont *wxFontList::
           //          each_font->GetFontId () == FamilyOrFontId) /* New font system */
           //#else
           each_font->GetFamily () == FamilyOrFontId &&
-          ((each_font->GetFaceName() == "") || each_font->GetFaceName() == Face))
+          ((each_font->GetFaceName() == _T("")) || each_font->GetFaceName() == Face))
         //#endif
         return each_font;
     }