Elliptic arc fix for getting bounds

[wxWidgets.git] / contrib / utils / wxrcedit / propframe.cpp

diff --git a/contrib/utils/wxrcedit/propframe.cpp b/contrib/utils/wxrcedit/propframe.cpp
index 898cdc1f9a877ebbf4c44cc7f2add0ed42710f83..b31b83425c47df98ade70d8ccb882514a02920c7 100644 (file)
--- a/contrib/utils/wxrcedit/propframe.cpp
+++ b/contrib/utils/wxrcedit/propframe.cpp
@@ -60,10 +60,10 @@ class PropsTree: public wxRemotelyScrolledTreeCtrl
             // Reset the device origin since it may have been set
             dc.SetDeviceOrigin(0, 0);
 
             // Reset the device origin since it may have been set
             dc.SetDeviceOrigin(0, 0);
 

-            wxPen pen(wxColour(_T("BLACK")), 1, wxSOLID);
+            wxPen pen(*wxBLACK, 1, wxSOLID);

             dc.SetPen(pen);
 
             dc.SetPen(pen);
 

-            dc.SetBrush(* wxTRANSPARENT_BRUSH);
+            dc.SetBrush(*wxTRANSPARENT_BRUSH);

 
             wxSize clientSize = GetClientSize();
             wxRect itemRect;
 
             wxSize clientSize = GetClientSize();
             wxRect itemRect;


@@ -129,7 +129,7 @@ class PropsTree: public wxRemotelyScrolledTreeCtrl
             wxRect bounding;
             GetBoundingRect(id, bounding);
 
             wxRect bounding;
             GetBoundingRect(id, bounding);
 

-            m_EditCtrl->Move(wxDefaultPosition.x, bounding.y);
+            m_EditCtrl->Move(wxDefaultCoord, bounding.y);

         }
 
         PropEditCtrl *m_EditCtrl;
         }
 
         PropEditCtrl *m_EditCtrl;


@@ -245,7 +245,7 @@ PropertiesFrame::PropertiesFrame()
     m_tree->SetCompanionWindow(m_valueWindow);
 
     wxConfigBase *cfg = wxConfigBase::Get();
     m_tree->SetCompanionWindow(m_valueWindow);
 
     wxConfigBase *cfg = wxConfigBase::Get();

-    SetSize(wxRect(wxPoint(cfg->Read(_T("propertiesframe_x"), wxDefaultPosition.x), cfg->Read(_T("propertiesframe_y"), wxDefaultPosition.y)),
+    SetSize(wxRect(wxPoint(cfg->Read(_T("propertiesframe_x"), wxDefaultCoord), cfg->Read(_T("propertiesframe_y"), wxDefaultCoord)),

             wxSize(cfg->Read(_T("propertiesframe_w"), 200), cfg->Read(_T("propertiesframe_h"), 200))));
 
 
             wxSize(cfg->Read(_T("propertiesframe_w"), 200), cfg->Read(_T("propertiesframe_h"), 200))));