Use gdk_window_invalidate instead of gtk_widget_queue_draw as the latter doesn't...

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 4129b48782485b86dddceed443659ba391bbdaf2..2d123c899f8dca07782acb256e8ab1e1f6a5dc88 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -528,7 +528,7 @@ void wxStockGDI::DeleteAll()
 
 const wxBrush* wxStockGDI::GetBrush(Item item)
 {
 
 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)
     if (brush == NULL)
     {
         switch (item)


@@ -573,7 +573,7 @@ const wxBrush* wxStockGDI::GetBrush(Item item)
 
 const wxColour* wxStockGDI::GetColour(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)
     if (colour == NULL)
     {
         switch (item)


@@ -609,7 +609,7 @@ const wxColour* wxStockGDI::GetColour(Item item)
 
 const wxCursor* wxStockGDI::GetCursor(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)
     if (cursor == NULL)
     {
         switch (item)


@@ -633,7 +633,7 @@ const wxCursor* wxStockGDI::GetCursor(Item item)
 
 const wxFont* wxStockGDI::GetFont(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)
     if (font == NULL)
     {
         switch (item)


@@ -660,7 +660,7 @@ const wxFont* wxStockGDI::GetFont(Item item)
 
 const wxPen* wxStockGDI::GetPen(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)
     if (pen == NULL)
     {
         switch (item)


@@ -671,6 +671,9 @@ const wxPen* wxStockGDI::GetPen(Item item)
         case PEN_BLACKDASHED:
             pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SHORT_DASH);
             break;
         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_CYAN:
             pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxPENSTYLE_SOLID);
             break;


@@ -717,6 +720,8 @@ void wxDeleteStockLists()
     wxDELETE(wxTheBrushList);
     wxDELETE(wxThePenList);
     wxDELETE(wxTheFontList);
     wxDELETE(wxTheBrushList);
     wxDELETE(wxThePenList);
     wxDELETE(wxTheFontList);

+
+    // wxTheColourDatabase is cleaned up by wxAppBase::CleanUp()

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -731,7 +736,7 @@ wxGDIObjListBase::~wxGDIObjListBase()
 {
     for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
     {
 {
     for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
     {

-        delete wx_static_cast(wxObject*, node->GetData());
+        delete static_cast<wxObject*>(node->GetData());

     }
 }
 
     }
 }