X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7742598f08a0ff574c12294b426ea27bd7ccbdb0..6c68273f974d3e5c5ba23ae43ce2d25a100388ff:/src/common/gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index e658746045..eb97decf64 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -41,10 +41,15 @@
 #endif
 
 #ifdef __WXMOTIF__
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Xm.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 #endif
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_CLASS(wxColourDatabase, wxList)
     IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
     IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
@@ -53,7 +58,6 @@
     IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
 
     IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
-#endif
 
 wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
@@ -89,16 +93,14 @@ bool wxRect::operator==(const wxRect& rect) const
           (height == rect.height));
 }
 
-// this doesn't compile
-#if 0
 const wxRect& wxRect::operator += (const wxRect& rect)
-{ 
-	*this = (*this + 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);
@@ -113,7 +115,6 @@ bool wxRect::Inside(int cx, int cy) const
 		  && ((cx - x) < width)
 		  );
 }
-#endif
 
 wxColourDatabase::wxColourDatabase (int type) : wxList (type)
 {
@@ -147,84 +148,84 @@ void wxColourDatabase::Initialize ()
   static cdef table[]={
 
 // #ifdef __WXMSW__
-   {_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},
+   {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__)
-   {_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},
+   {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}
@@ -259,6 +260,9 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 #ifdef __WXMSW__
   else return NULL;
 #endif
+#ifdef __WXPM__
+  else return NULL;
+#endif
 
 // TODO for other implementations. This should really go into
 // platform-specific directories.
@@ -354,10 +358,17 @@ void wxInitializeStockObjects ()
   //  wxFontPool = new XFontPool;
 #endif
 
-  wxNORMAL_FONT = new wxFont (12, wxMODERN, wxNORMAL, wxNORMAL);
-  wxSMALL_FONT = new wxFont (10, wxSWISS, wxNORMAL, wxNORMAL);
-  wxITALIC_FONT = new wxFont (12, wxROMAN, wxITALIC, wxNORMAL);
-  wxSWISS_FONT = new wxFont (12, wxSWISS, wxNORMAL, wxNORMAL);
+  // why under MSW fonts shouldn't have the standard system size?
+#ifdef __WXMSW__
+  static const int sizeFont = 10;
+#else
+  static const int sizeFont = 12;
+#endif
+
+  wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
+  wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL);
+  wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
+  wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL);
 
   wxRED_PEN = new wxPen ("RED", 1, wxSOLID);
   wxCYAN_PEN = new wxPen ("CYAN", 1, wxSOLID);
@@ -449,7 +460,6 @@ wxBitmapList::wxBitmapList ()
 
 wxBitmapList::~wxBitmapList ()
 {
-#if defined(__WXMSW__) || defined(__WXMOTIF__)
   wxNode *node = First ();
   while (node)
     {
@@ -459,13 +469,11 @@ wxBitmapList::~wxBitmapList ()
         delete bitmap;
       node = next;
     }
-#endif
 }
 
 // Pen and Brush lists
 wxPenList::~wxPenList ()
 {
-#if defined(__WXMSW__) || defined(__WXMOTIF__)
   wxNode *node = First ();
   while (node)
     {
@@ -475,7 +483,6 @@ wxPenList::~wxPenList ()
         delete pen;
       node = next;
     }
-#endif
 }
 
 void wxPenList::AddPen (wxPen * pen)
@@ -493,7 +500,8 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
   for (wxNode * node = First (); node; node = node->Next ())
     {
       wxPen *each_pen = (wxPen *) node->Data ();
-      if (each_pen && each_pen->GetVisible() &&
+      if (each_pen &&
+          each_pen->GetVisible() &&
           each_pen->GetWidth () == width &&
           each_pen->GetStyle () == style &&
           each_pen->GetColour ().Red () == colour.Red () &&
@@ -508,12 +516,12 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
   // returning a pointer to an automatic variable and hanging on to it
   // (dangling pointer).
   pen->SetVisible(TRUE);
+
   return pen;
 }
 
 wxBrushList::~wxBrushList ()
 {
-#if defined(__WXMSW__) || defined(__WXMOTIF__)
   wxNode *node = First ();
   while (node)
     {
@@ -523,7 +531,6 @@ wxBrushList::~wxBrushList ()
         delete brush;
       node = next;
     }
-#endif
 }
 
 void wxBrushList::AddBrush (wxBrush * brush)
@@ -536,19 +543,23 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
   for (wxNode * node = First (); node; node = node->Next ())
     {
       wxBrush *each_brush = (wxBrush *) node->Data ();
-      if (each_brush && each_brush->GetVisible() &&
+      if (each_brush &&
+          each_brush->GetVisible() &&
           each_brush->GetStyle () == style &&
           each_brush->GetColour ().Red () == colour.Red () &&
           each_brush->GetColour ().Green () == colour.Green () &&
           each_brush->GetColour ().Blue () == colour.Blue ())
         return each_brush;
     }
+
   // Yes, we can return a pointer to this in a later FindOrCreateBrush call,
   // because we created it within FindOrCreateBrush. Safeguards against
   // returning a pointer to an automatic variable and hanging on to it
   // (dangling pointer).
   wxBrush *brush = new wxBrush (colour, style);
+
   brush->SetVisible(TRUE);
+
   return brush;
 }
 
@@ -559,19 +570,19 @@ void wxBrushList::RemoveBrush (wxBrush * brush)
 
 wxFontList::~wxFontList ()
 {
-  wxNode *node = First ();
-  while (node)
+    wxNode *node = First ();
+    while (node)
     {
-          // Only delete objects that are 'visible', i.e.
-          // that have been created using FindOrCreate...,
-          // where the pointers are expected to be shared
-          // (and therefore not deleted by any one part of an app).
-      wxFont *font = (wxFont *) node->Data ();
-      wxNode *next = node->Next ();
-          if (font->GetVisible())
-                delete font;
-      node = next;
-}
+        // Only delete objects that are 'visible', i.e.
+        // that have been created using FindOrCreate...,
+        // where the pointers are expected to be shared
+        // (and therefore not deleted by any one part of an app).
+        wxFont *font = (wxFont *) node->Data ();
+        wxNode *next = node->Next ();
+        if (font->GetVisible())
+            delete font;
+        node = next;
+    }
 }
 
 void wxFontList::AddFont (wxFont * font)
@@ -585,26 +596,32 @@ void wxFontList::RemoveFont (wxFont * font)
 }
 
 wxFont *wxFontList::
-        FindOrCreateFont (int PointSize, int FamilyOrFontId, int Style, int Weight, bool underline, const wxString& Face)
+        FindOrCreateFont (int PointSize, int FamilyOrFontId, int Style, int Weight, bool underline, const wxString& Face, wxFontEncoding encoding)
 {
   for (wxNode * node = First (); node; node = node->Next ())
     {
       wxFont *each_font = (wxFont *) node->Data ();
-      if (each_font && each_font->GetVisible() && each_font->Ok() &&
+      if (each_font &&
+          each_font->GetVisible() &&
+          each_font->Ok() &&
           each_font->GetPointSize () == PointSize &&
           each_font->GetStyle () == Style &&
           each_font->GetWeight () == Weight &&
           each_font->GetUnderlined () == underline &&
-          //#if defined(__X__)
-          //          each_font->GetFontId () == FamilyOrFontId) /* New font system */
-          //#else
-          each_font->GetFamily () == FamilyOrFontId &&
-          ((each_font->GetFaceName() == _T("")) || each_font->GetFaceName() == Face))
-        //#endif
+#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) &&
+          (encoding == wxFONTENCODING_DEFAULT || each_font->GetEncoding() == encoding))
         return each_font;
     }
-  wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face);
+  wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face, encoding);
+
   font->SetVisible(TRUE);
+
   return font;
 }