wxDataObejct and related changes (won't compile right now)

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index eae3619cec93a64c641595af7a755ff43988f401..106d32a3efa468fcfb5f09e0290933eebd56194c 100644 (file)
--- 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/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>
 
 #include "wx/log.h"
 #include <string.h>


@@ -43,29 +45,16 @@
 #endif
 
 #if !USE_SHARED_LIBRARY
 #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
 
 #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;
 wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
   x = topLeft.x;


@@ -92,38 +81,38 @@ wxRect::wxRect(const wxPoint& point, const wxSize& size)
     width = size.x; height = size.y;
 }
 
     width = size.x; height = size.y;
 }
 

-wxRect::wxRect(const wxRect& rect)
+bool wxRect::operator==(const wxRect& rect) const

 {
 {

-    x = rect.x;
-    y = rect.y;
-    width = rect.width;
-    height = rect.height;
+  return ((x == rect.x) &&
+          (y == rect.y) &&
+          (width == rect.width) &&
+          (height == rect.height));

 }
 
 }
 

-wxRect& wxRect::operator = (const wxRect& rect)
+const wxRect& wxRect::operator += (const wxRect& rect)

 {
 {

-    x = rect.x; y = rect.y; width = rect.width; height = rect.height;
-    return *this;
+       *this = (*this + rect);
+       return ( *this ) ;

 }
 
 }
 

-bool wxRect::operator == (const wxRect& rect)
+wxRect wxRect::operator + (const wxRect& rect) const

 {
 {

-  return ((x == rect.x) &&
-          (y == rect.y) &&
-          (width == rect.width) &&
-          (height == rect.height));
+       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::operator != (const wxRect& rect)
+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 {
   // Added: Not all
 
   struct cdef {

-   char *name;
+   wxChar *name;

    int r,g,b;
   };
   cdef cc;
   static cdef table[]={
 
 // #ifdef __WXMSW__
    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},
+   {wxT("AQUAMARINE"),112, 219, 147},
+   {wxT("BLACK"),0, 0, 0},
+   {wxT("BLUE"), 0, 0, 255},
+   {wxT("BLUE VIOLET"), 159, 95, 159},
+   {wxT("BROWN"), 165, 42, 42},
+   {wxT("CADET BLUE"), 95, 159, 159},
+   {wxT("CORAL"), 255, 127, 0},
+   {wxT("CORNFLOWER BLUE"), 66, 66, 111},
+   {wxT("CYAN"), 0, 255, 255},
+   {wxT("DARK GREY"), 47, 47, 47},   // ?
+
+   {wxT("DARK GREEN"), 47, 79, 47},
+   {wxT("DARK OLIVE GREEN"), 79, 79, 47},
+   {wxT("DARK ORCHID"), 153, 50, 204},
+   {wxT("DARK SLATE BLUE"), 107, 35, 142},
+   {wxT("DARK SLATE GREY"), 47, 79, 79},
+   {wxT("DARK TURQUOISE"), 112, 147, 219},
+   {wxT("DIM GREY"), 84, 84, 84},
+   {wxT("FIREBRICK"), 142, 35, 35},
+   {wxT("FOREST GREEN"), 35, 142, 35},
+   {wxT("GOLD"), 204, 127, 50},
+   {wxT("GOLDENROD"), 219, 219, 112},
+   {wxT("GREY"), 128, 128, 128},
+   {wxT("GREEN"), 0, 255, 0},
+   {wxT("GREEN YELLOW"), 147, 219, 112},
+   {wxT("INDIAN RED"), 79, 47, 47},
+   {wxT("KHAKI"), 159, 159, 95},
+   {wxT("LIGHT BLUE"), 191, 216, 216},
+   {wxT("LIGHT GREY"), 192, 192, 192},
+   {wxT("LIGHT STEEL BLUE"), 143, 143, 188},
+   {wxT("LIME GREEN"), 50, 204, 50},
+   {wxT("LIGHT MAGENTA"), 255, 0, 255},
+   {wxT("MAGENTA"), 255, 0, 255},
+   {wxT("MAROON"), 142, 35, 107},
+   {wxT("MEDIUM AQUAMARINE"), 50, 204, 153},
+   {wxT("MEDIUM GREY"), 100, 100, 100},
+   {wxT("MEDIUM BLUE"), 50, 50, 204},
+   {wxT("MEDIUM FOREST GREEN"), 107, 142, 35},
+   {wxT("MEDIUM GOLDENROD"), 234, 234, 173},
+   {wxT("MEDIUM ORCHID"), 147, 112, 219},
+   {wxT("MEDIUM SEA GREEN"), 66, 111, 66},
+   {wxT("MEDIUM SLATE BLUE"), 127, 0, 255},
+   {wxT("MEDIUM SPRING GREEN"), 127, 255, 0},
+   {wxT("MEDIUM TURQUOISE"), 112, 219, 219},
+   {wxT("MEDIUM VIOLET RED"), 219, 112, 147},
+   {wxT("MIDNIGHT BLUE"), 47, 47, 79},
+   {wxT("NAVY"), 35, 35, 142},
+   {wxT("ORANGE"), 204, 50, 50},
+   {wxT("ORANGE RED"), 255, 0, 127},
+   {wxT("ORCHID"), 219, 112, 219},
+   {wxT("PALE GREEN"), 143, 188, 143},
+   {wxT("PINK"), 188, 143, 234},
+   {wxT("PLUM"), 234, 173, 234},
+   {wxT("PURPLE"), 176, 0, 255},
+   {wxT("RED"), 255, 0, 0},
+   {wxT("SALMON"), 111, 66, 66},
+   {wxT("SEA GREEN"), 35, 142, 107},
+   {wxT("SIENNA"), 142, 107, 35},
+   {wxT("SKY BLUE"), 50, 153, 204},
+   {wxT("SLATE BLUE"), 0, 127, 255},
+   {wxT("SPRING GREEN"), 0, 255, 127},
+   {wxT("STEEL BLUE"), 35, 107, 142},
+   {wxT("TAN"), 219, 147, 112},
+   {wxT("THISTLE"), 216, 191, 216},
+   {wxT("TURQUOISE"), 173, 234, 234},
+   {wxT("VIOLET"), 79, 47, 79},
+   {wxT("VIOLET RED"), 204, 50, 153},
+   {wxT("WHEAT"), 216, 216, 191},
+   {wxT("WHITE"), 255, 255, 255},
+   {wxT("YELLOW"), 255, 255, 0},
+   {wxT("YELLOW GREEN"), 153, 204, 50},

 // #endif
 
 #if defined(__WXGTK__) || defined(__X__)
 // #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},
+   {wxT("MEDIUM GOLDENROD"), 234, 234, 173},
+   {wxT("MEDIUM FOREST GREEN"), 107, 142, 35},
+   {wxT("LIGHT MAGENTA"), 255, 0, 255},
+   {wxT("MEDIUM GREY"), 100, 100, 100},

 #endif
 
    {0,0,0,0}
 #endif
 
    {0,0,0,0}


@@ -267,6 +256,9 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 #ifdef __WXMSW__
   else return NULL;
 #endif
 #ifdef __WXMSW__
   else return NULL;
 #endif

+#ifdef __WXPM__
+  else return NULL;
+#endif

 
 // TODO for other implementations. This should really go into
 // platform-specific directories.
 
 // TODO for other implementations. This should really go into
 // platform-specific directories.


@@ -321,23 +313,29 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 
 wxString wxColourDatabase::FindName (const wxColour& colour) const
 {
 
 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 ();

 
 

-      if (col->Red () == red && col->Green () == green && col->Blue () == blue)
+    for (wxNode * node = First (); node; node = node->Next ())
+    {
+        wxColour *col = (wxColour *) node->Data ();
+
+        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 () {
 }
 
 void wxInitializeStockLists () {


@@ -600,8 +598,13 @@ wxFont *wxFontList::
           //#if defined(__X__)
           //          each_font->GetFontId () == FamilyOrFontId) /* New font system */
           //#else
           //#if defined(__X__)
           //          each_font->GetFontId () == FamilyOrFontId) /* New font system */
           //#else

-          each_font->GetFamily () == FamilyOrFontId &&
-          ((each_font->GetFaceName() == "") || each_font->GetFaceName() == Face))
+#if defined(__WXGTK__)
+          (each_font->GetFamily() == FamilyOrFontId ||
+           (each_font->GetFamily() == wxSWISS && FamilyOrFontId == wxDEFAULT)) &&
+#else
+          each_font->GetFamily() == FamilyOrFontId &&
+#endif
+          ((each_font->GetFaceName() == wxT("")) || each_font->GetFaceName() == Face))

         //#endif
         return each_font;
     }
         //#endif
         return each_font;
     }