Mutiple updates from SciTech for wxWindows including the following:

[wxWidgets.git] / src / stc / PlatWX.cpp

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 862d16456d3fe6e6c3e71267cf1326033f267aa3..0e7390741484ce8e61b0d2123c91f9db2edc4a95 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -174,6 +174,8 @@ void Surface::InitPixMap(int width, int height, Surface *surface_) {
     Release();
     hdc = new wxMemoryDC(surface_->hdc);
     hdcOwned = true;
+    if (width < 1) width = 1;
+    if (height < 1) height = 1;
     bitmap = new wxBitmap(width, height);
     ((wxMemoryDC*)hdc)->SelectObject(*bitmap);
 }
@@ -198,7 +200,7 @@ int Surface::LogPixelsY() {
 
 
 int Surface::DeviceHeightFont(int points) {
-    return points * LogPixelsY() / 72;
+    return points;
 }
 
 
@@ -454,7 +456,7 @@ class wxSTCListBox : public wxListBox {
 public:
     wxSTCListBox(wxWindow* parent, wxWindowID id)
         : wxListBox(parent, id, wxDefaultPosition, wxDefaultSize,
-                    0, NULL, wxLB_SINGLE | wxLB_SORT | wxSIMPLE_BORDER)
+                    0, NULL, wxLB_SINGLE | wxSIMPLE_BORDER | wxLB_SORT )
         {}
 
     void OnFocus(wxFocusEvent& event) {
@@ -462,7 +464,7 @@ public:
         event.Skip();
     }
 
-#ifdef __WXGTK__
+#if 0 // #ifdef __WXGTK__
     void DoSetFirstItem(int n);
 #endif
 
@@ -477,7 +479,7 @@ END_EVENT_TABLE()
 
 
 
-#ifdef __WXGTK__
+#if 0 // #ifdef __WXGTK__
     // This can be removed after 2.2.2 I think
 void wxSTCListBox::DoSetFirstItem( int n )
 {
@@ -533,15 +535,21 @@ void ListBox::Create(Window &parent, int ctrlID) {
 //                       0, NULL, wxLB_SINGLE | wxLB_SORT | wxSIMPLE_BORDER);
 }
 
+void ListBox::SetVisibleRows(int rows) {
+       desiredVisibleRows = rows;
+        printf("SetVisibleRows: %d\n", rows);
+}
+
 PRectangle ListBox::GetDesiredRect() {
     wxSize sz = ((wxListBox*)id)->GetBestSize();
+    printf("GetDesiredRect: %d, %d\n", sz.x, sz.y);
     PRectangle rc;
     rc.top = 0;
     rc.left = 0;
-    if (sz.x > 150)   // TODO: A better way to determine these max sizes
-        sz.x = 150;
-    if (sz.y > 100)
-        sz.y = 100;
+    if (sz.x > 400)
+        sz.x = 400;
+    if (sz.y > 150)
+        sz.y = 150;
     rc.right = sz.x;
     rc.bottom = sz.y;