Trying to fix dialog close/focus_widget problem.

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

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 2bb9ba84eba41d200cb98681f613597c98d431cd..65d7de1b454a19f4c145dbac61ce36810108fe5f 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -9,6 +9,11 @@
 #include "Platform.h"
 #include "wx/stc/stc.h"
 
 #include "Platform.h"
 #include "wx/stc/stc.h"
 

+
+#ifdef __WXGTK__
+#include <gtk/gtk.h>
+#endif
+

 Point Point::FromLong(long lpoint) {
     return Point(lpoint & 0xFFFF, lpoint >> 16);
 }
 Point Point::FromLong(long lpoint) {
     return Point(lpoint & 0xFFFF, lpoint >> 16);
 }


@@ -107,6 +112,8 @@ Font::~Font() {
 }
 
 void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic) {
 }
 
 void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic) {

+    // TODO:  what to do about the characterSet?
+

     Release();
     id = new wxFont(size,
                     wxDEFAULT,
     Release();
     id = new wxFont(size,
                     wxDEFAULT,


@@ -156,22 +163,21 @@ void Surface::Init() {
     Release();
     hdc = new wxMemoryDC();
     hdcOwned = true;
     Release();
     hdc = new wxMemoryDC();
     hdcOwned = true;

-    // **** ::SetTextAlign(hdc, TA_BASELINE);

 }
 
 void Surface::Init(SurfaceID hdc_) {
     Release();
     hdc = hdc_;
 }
 
 void Surface::Init(SurfaceID hdc_) {
     Release();
     hdc = hdc_;

-    // **** ::SetTextAlign(hdc, TA_BASELINE);

 }
 
 void Surface::InitPixMap(int width, int height, Surface *surface_) {
     Release();
     hdc = new wxMemoryDC(surface_->hdc);
     hdcOwned = true;
 }
 
 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);
     bitmap = new wxBitmap(width, height);
     ((wxMemoryDC*)hdc)->SelectObject(*bitmap);

-    // **** ::SetTextAlign(hdc, TA_BASELINE);

 }
 
 void Surface::PenColour(Colour fore) {
 }
 
 void Surface::PenColour(Colour fore) {


@@ -194,7 +200,7 @@ int Surface::LogPixelsY() {
 
 
 int Surface::DeviceHeightFont(int points) {
 
 
 int Surface::DeviceHeightFont(int points) {

-    return points * LogPixelsY() / 72;
+    return points;

 }
 
 
 }
 
 


@@ -348,7 +354,7 @@ int Surface::AverageCharWidth(Font &font) {
 }
 
 int Surface::SetPalette(Palette *pal, bool inBackGround) {
 }
 
 int Surface::SetPalette(Palette *pal, bool inBackGround) {

-    return 0;  // **** figure out what to do with palettes...
+    return 0;

 }
 
 void Surface::SetClip(PRectangle rc) {
 }
 
 void Surface::SetClip(PRectangle rc) {


@@ -446,6 +452,26 @@ void Window::SetTitle(const char *s) {
 }
 
 
 }
 
 

+class wxSTCListBox : public wxListBox {
+public:
+    wxSTCListBox(wxWindow* parent, wxWindowID id)
+        : wxListBox(parent, id, wxDefaultPosition, wxDefaultSize,
+                    0, NULL, wxLB_SINGLE | wxSIMPLE_BORDER) // | wxLB_SORT )
+        {}
+
+    void OnFocus(wxFocusEvent& event) {
+        GetParent()->SetFocus();
+        event.Skip();
+    }
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxSTCListBox, wxListBox)
+    EVT_SET_FOCUS(wxSTCListBox::OnFocus)
+END_EVENT_TABLE()
+

 
 ListBox::ListBox() {
 }
 
 ListBox::ListBox() {
 }


@@ -454,8 +480,33 @@ ListBox::~ListBox() {
 }
 
 void ListBox::Create(Window &parent, int ctrlID) {
 }
 
 void ListBox::Create(Window &parent, int ctrlID) {

-    id = new wxListBox(parent.id, ctrlID, wxDefaultPosition, wxDefaultSize,
-                       0, NULL, wxLB_SINGLE | wxLB_SORT);
+    id = new wxSTCListBox(parent.id, ctrlID);
+}
+
+void ListBox::SetVisibleRows(int rows) {
+       desiredVisibleRows = rows;
+}
+
+PRectangle ListBox::GetDesiredRect() {
+    wxSize sz = ((wxListBox*)id)->GetBestSize();
+    PRectangle rc;
+    rc.top = 0;
+    rc.left = 0;
+    if (sz.x > 400)
+        sz.x = 400;
+    if (sz.y > 160)  // TODO:  Use desiredVisibleRows??
+        sz.y = 160;
+    rc.right = sz.x;
+    rc.bottom = sz.y;
+    return rc;
+}
+
+void ListBox::SetAverageCharWidth(int width) {
+    aveCharWidth = width;
+}
+
+void ListBox::SetFont(Font &font) {
+    Window::SetFont(font);

 }
 
 void ListBox::Clear() {
 }
 
 void ListBox::Clear() {


@@ -467,11 +518,18 @@ void ListBox::Append(char *s) {
 }
 
 int ListBox::Length() {
 }
 
 int ListBox::Length() {

-    return ((wxListBox*)id)->Number();
+    return ((wxListBox*)id)->GetCount();

 }
 
 void ListBox::Select(int n) {
     ((wxListBox*)id)->SetSelection(n);
 }
 
 void ListBox::Select(int n) {
     ((wxListBox*)id)->SetSelection(n);

+#ifdef __WXGTK__
+    if (n > 4)
+        n = n - 4;
+    else
+        n = 1;
+    ((wxListBox*)id)->SetFirstItem(n);
+#endif

 }
 
 int ListBox::GetSelection() {
 }
 
 int ListBox::GetSelection() {


@@ -479,13 +537,7 @@ int ListBox::GetSelection() {
 }
 
 int ListBox::Find(const char *prefix) {
 }
 
 int ListBox::Find(const char *prefix) {

-    if (prefix) {
-        for (int x=0; x < ((wxListBox*)id)->Number(); x++) {
-            wxString text = ((wxListBox*)id)->GetString(x);
-            if (text.StartsWith(prefix))
-                return x;
-        }
-    }
+    // No longer used

     return -1;
 }
 
     return -1;
 }
 


@@ -591,6 +643,36 @@ void Platform::DebugPrintf(const char *format, ...) {
 #endif
 }
 
 #endif
 }
 

+
+static bool assertionPopUps = true;
+
+bool Platform::ShowAssertionPopUps(bool assertionPopUps_) {
+       bool ret = assertionPopUps;
+       assertionPopUps = assertionPopUps_;
+       return ret;
+}
+
+void Platform::Assert(const char *c, const char *file, int line) {
+       char buffer[2000];
+       sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
+       if (assertionPopUps) {
+               int idButton = wxMessageBox(buffer, "Assertion failure",
+                                            wxICON_HAND | wxOK);
+//             if (idButton == IDRETRY) {
+//                     ::DebugBreak();
+//             } else if (idButton == IDIGNORE) {
+//                     // all OK
+//             } else {
+//                     abort();
+//             }
+       } else {
+               strcat(buffer, "\r\n");
+               Platform::DebugDisplay(buffer);
+               abort();
+       }
+}
+
+

 int Platform::Clamp(int val, int minVal, int maxVal) {
     if (val > maxVal)
         val = maxVal;
 int Platform::Clamp(int val, int minVal, int maxVal) {
     if (val > maxVal)
         val = maxVal;