X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40fcf546f6168f51c070d4ded3c40a75c0780fe8..439c7eae9b77cc6c0414ccae52e688d626c86851:/src/common/gdicmn.cpp?ds=inline

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index f56aad7d4c..06117b98c2 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -31,6 +31,7 @@
     #include "wx/bitmap.h"
     #include "wx/colour.h"
     #include "wx/font.h"
+    #include "wx/math.h"
 #endif
 
 
@@ -404,7 +405,7 @@ void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour)
 
     // ... and we also allow both grey/gray
     wxString colNameAlt = colName;
-    if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) )
+    if ( !colNameAlt.Replace(wxT("GRAY"), wxT("GREY")) )
     {
         // but in this case it is not necessary so avoid extra search below
         colNameAlt.clear();
@@ -432,7 +433,7 @@ wxColour wxColourDatabase::Find(const wxString& colour) const
     wxString colName = colour;
     colName.MakeUpper();
     wxString colNameAlt = colName;
-    if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) )
+    if ( !colNameAlt.Replace(wxT("GRAY"), wxT("GREY")) )
         colNameAlt.clear();
 
     wxStringToColourHashMap::iterator it = m_map->find(colName);
@@ -527,7 +528,7 @@ void wxStockGDI::DeleteAll()
 
 const wxBrush* wxStockGDI::GetBrush(Item item)
 {
-    wxBrush* brush = wx_static_cast(wxBrush*, ms_stockObject[item]);
+    wxBrush* brush = static_cast<wxBrush*>(ms_stockObject[item]);
     if (brush == NULL)
     {
         switch (item)
@@ -544,6 +545,9 @@ const wxBrush* wxStockGDI::GetBrush(Item item)
         case BRUSH_GREEN:
             brush = new wxBrush(*GetColour(COLOUR_GREEN), wxBRUSHSTYLE_SOLID);
             break;
+        case BRUSH_YELLOW:
+            brush = new wxBrush(*GetColour(COLOUR_YELLOW), wxBRUSHSTYLE_SOLID);
+            break;
         case BRUSH_GREY:
             brush = new wxBrush(wxColour(wxT("GREY")), wxBRUSHSTYLE_SOLID);
             break;
@@ -572,7 +576,7 @@ const wxBrush* wxStockGDI::GetBrush(Item item)
 
 const wxColour* wxStockGDI::GetColour(Item item)
 {
-    wxColour* colour = wx_static_cast(wxColour*, ms_stockObject[item]);
+    wxColour* colour = static_cast<wxColour*>(ms_stockObject[item]);
     if (colour == NULL)
     {
         switch (item)
@@ -589,6 +593,9 @@ const wxColour* wxStockGDI::GetColour(Item item)
         case COLOUR_GREEN:
             colour = new wxColour(0, 255, 0);
             break;
+        case COLOUR_YELLOW:
+            colour = new wxColour(255, 255, 0);
+            break;
         case COLOUR_LIGHTGREY:
             colour = new wxColour(wxT("LIGHT GREY"));
             break;
@@ -608,7 +615,7 @@ const wxColour* wxStockGDI::GetColour(Item item)
 
 const wxCursor* wxStockGDI::GetCursor(Item item)
 {
-    wxCursor* cursor = wx_static_cast(wxCursor*, ms_stockObject[item]);
+    wxCursor* cursor = static_cast<wxCursor*>(ms_stockObject[item]);
     if (cursor == NULL)
     {
         switch (item)
@@ -632,7 +639,7 @@ const wxCursor* wxStockGDI::GetCursor(Item item)
 
 const wxFont* wxStockGDI::GetFont(Item item)
 {
-    wxFont* font = wx_static_cast(wxFont*, ms_stockObject[item]);
+    wxFont* font = static_cast<wxFont*>(ms_stockObject[item]);
     if (font == NULL)
     {
         switch (item)
@@ -659,7 +666,7 @@ const wxFont* wxStockGDI::GetFont(Item item)
 
 const wxPen* wxStockGDI::GetPen(Item item)
 {
-    wxPen* pen = wx_static_cast(wxPen*, ms_stockObject[item]);
+    wxPen* pen = static_cast<wxPen*>(ms_stockObject[item]);
     if (pen == NULL)
     {
         switch (item)
@@ -670,12 +677,18 @@ const wxPen* wxStockGDI::GetPen(Item item)
         case PEN_BLACKDASHED:
             pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SHORT_DASH);
             break;
+        case PEN_BLUE:
+            pen = new wxPen(*GetColour(COLOUR_BLUE), 1, wxPENSTYLE_SOLID);
+            break;
         case PEN_CYAN:
             pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxPENSTYLE_SOLID);
             break;
         case PEN_GREEN:
             pen = new wxPen(*GetColour(COLOUR_GREEN), 1, wxPENSTYLE_SOLID);
             break;
+        case PEN_YELLOW:
+            pen = new wxPen(*GetColour(COLOUR_YELLOW), 1, wxPENSTYLE_SOLID);
+            break;
         case PEN_GREY:
             pen = new wxPen(wxColour(wxT("GREY")), 1, wxPENSTYLE_SOLID);
             break;
@@ -716,6 +729,8 @@ void wxDeleteStockLists()
     wxDELETE(wxTheBrushList);
     wxDELETE(wxThePenList);
     wxDELETE(wxTheFontList);
+
+    // wxTheColourDatabase is cleaned up by wxAppBase::CleanUp()
 }
 
 // ============================================================================
@@ -730,7 +745,7 @@ wxGDIObjListBase::~wxGDIObjListBase()
 {
     for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
     {
-        delete wx_static_cast(wxObject*, node->GetData());
+        delete static_cast<wxObject*>(node->GetData());
     }
 }
 
@@ -885,8 +900,8 @@ wxSize wxGetDisplayPPI()
     const wxSize pixels = wxGetDisplaySize();
     const wxSize mm = wxGetDisplaySizeMM();
 
-    return wxSize((pixels.x * 25.4) / mm.x,
-                  (pixels.y * 25.4) / mm.y);
+    return wxSize((int)((pixels.x * inches2mm) / mm.x),
+                  (int)((pixels.y * inches2mm) / mm.y));
 }
 
 wxResourceCache::~wxResourceCache ()