X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75cada8e68f31ca6475f238fe506352ccb0783f1..4ec6efd6ab82c74f252eddfc3b4a346cc4f495a1:/src/stc/PlatWX.cpp?ds=sidebyside

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 3ce7bceafc..a57756bc9c 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -25,7 +25,8 @@ wxRect wxRectFromPRectangle(PRectangle prc) {
 }
 
 PRectangle PRectangleFromwxRect(wxRect rc) {
-    return PRectangle(rc.GetLeft(), rc.GetTop(), rc.GetRight(), rc.GetBottom());
+    return PRectangle(rc.GetLeft(), rc.GetTop(),
+                      rc.GetRight()+1, rc.GetBottom()+1);
 }
 
 Colour::Colour(long lcol) {
@@ -494,8 +495,8 @@ PRectangle ListBox::GetDesiredRect() {
     rc.left = 0;
     if (sz.x > 400)
         sz.x = 400;
-//      if (sz.y > 150)  // TODO:  Use desiredVisibleRows??
-//          sz.y = 150;  // For now just use the default from GetBestSize
+    if (sz.y > 160)  // TODO:  Use desiredVisibleRows??
+        sz.y = 160;
     rc.right = sz.x;
     rc.bottom = sz.y;
     return rc;
@@ -574,13 +575,13 @@ void Menu::Show(Point pt, Window &w) {
 
 Colour Platform::Chrome() {
     wxColour c;
-    c = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+    c = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     return Colour(c.Red(), c.Green(), c.Blue());
 }
 
 Colour Platform::ChromeHighlight() {
     wxColour c;
-    c = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHIGHLIGHT);
+    c = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT);
     return Colour(c.Red(), c.Green(), c.Blue());
 }