X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ed345b7edec3552c51b3cf9453a81b29568e946..6258e418a07e8edda218c27aade9e522deaeaf74:/contrib/utils/wxrcedit/propframe.cpp

diff --git a/contrib/utils/wxrcedit/propframe.cpp b/contrib/utils/wxrcedit/propframe.cpp
index 35022bd126..1e160c67e7 100644
--- a/contrib/utils/wxrcedit/propframe.cpp
+++ b/contrib/utils/wxrcedit/propframe.cpp
@@ -18,7 +18,7 @@
 #endif
 
 #include "wx/wx.h"
-#include "wx/xrc/xml.h"
+#include "wx/xml/xml.h"
 #include "wx/config.h"
 #include "splittree.h"
 #include "xmlhelpr.h"
@@ -38,7 +38,18 @@ class PropsTree: public wxRemotelyScrolledTreeCtrl
         PropsTree(wxWindow* parent, wxWindowID id, const wxPoint& pt = wxDefaultPosition,
             const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS)
             : wxRemotelyScrolledTreeCtrl(parent, id, pt, sz, style),
-              m_EditCtrl(NULL) {}
+              m_EditCtrl(NULL) 
+		{
+#if 0
+            // VS: Don't do it, it is *extremely* ugly.
+            //     FIXME: find a better solution.
+
+			//make text larger so controls will fit properly
+			wxFont font = GetFont();
+			font.SetPointSize(font.GetPointSize()*1.5);
+			SetFont(font);
+#endif
+        }
 
 	    void OnPaint(wxPaintEvent& event)
         {
@@ -50,8 +61,8 @@ class PropsTree: public wxRemotelyScrolledTreeCtrl
             dc.SetDeviceOrigin(0, 0);
 
 	        wxPen pen(wxColour(_T("BLACK")), 1, wxSOLID);
-	        dc.SetPen(pen);
-            
+	        dc.SetPen(pen);          
+
 	        dc.SetBrush(* wxTRANSPARENT_BRUSH);
 
             wxSize clientSize = GetClientSize();
@@ -63,6 +74,7 @@ class PropsTree: public wxRemotelyScrolledTreeCtrl
 		        if (h.IsOk() && GetBoundingRect(h, itemRect))
 		        {
 			        cy = itemRect.GetTop();
+
 			        dc.DrawLine(0, cy, clientSize.x, cy);
 			        lastH = h;
 		        }
@@ -73,7 +85,7 @@ class PropsTree: public wxRemotelyScrolledTreeCtrl
 		        dc.DrawLine(0, cy, clientSize.x, cy);
 	        }
         }
-        
+
         void OnSelChange(wxTreeEvent& event)
         {
             if (m_EditCtrl != NULL)
@@ -88,6 +100,7 @@ class PropsTree: public wxRemotelyScrolledTreeCtrl
             {
                 wxRect bounding;
                 GetBoundingRect(item, bounding);
+
                 bounding.SetX(0);
                 bounding.SetWidth(GetCompanionWindow()->GetSize().x); 
                 dt->EditCtrl->BeginEdit(bounding, item);
@@ -168,7 +181,6 @@ class PropsValueWindow: public wxTreeCompanionWindow
             wxTreeItemId item = GetTreeCtrl()->HitTest(wxPoint(1, event.GetY()), flags);
             if (item.IsOk())
             {
-                GetTreeCtrl()->ScrollTo(item);
                 GetTreeCtrl()->SelectItem(item);
             }
         }