wxX11:

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

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 0fc480d8064420ece1e02da0d9dc1a6ddf00c284..dda64f77b22c786aa979b04956232e4025d4e94f 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -9,18 +9,24 @@
 #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) {
 Point Point::FromLong(long lpoint) {

-    return Point(lpoint & 0xFFFF, lpoint >> 32);
+    return Point(lpoint & 0xFFFF, lpoint >> 16);

 }
 
 wxRect wxRectFromPRectangle(PRectangle prc) {
     wxRect rc(prc.left, prc.top,
 }
 
 wxRect wxRectFromPRectangle(PRectangle prc) {
     wxRect rc(prc.left, prc.top,

-              prc.right-prc.left+1, prc.bottom-prc.top+1);
+              prc.right-prc.left, prc.bottom-prc.top);

     return rc;
 }
 
 PRectangle PRectangleFromwxRect(wxRect rc) {
     return rc;
 }
 
 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) {
 }
 
 Colour::Colour(long lcol) {


@@ -106,14 +112,17 @@ Font::Font() {
 Font::~Font() {
 }
 
 Font::~Font() {
 }
 

-void Font::Create(const char *faceName, 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,
                     italic ? wxITALIC :  wxNORMAL,
                     bold ? wxBOLD : wxNORMAL,
                     false,
     Release();
     id = new wxFont(size,
                     wxDEFAULT,
                     italic ? wxITALIC :  wxNORMAL,
                     bold ? wxBOLD : wxNORMAL,
                     false,

-                    faceName);
+                    faceName,
+                    wxFONTENCODING_DEFAULT);

 }
 
 
 }
 
 


@@ -155,22 +164,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) {


@@ -182,12 +190,7 @@ void Surface::BrushColor(Colour back) {
 }
 
 void Surface::SetFont(Font &font_) {
 }
 
 void Surface::SetFont(Font &font_) {

-
-  // I think the following check is valid.  
-  // It eliminates a crash for me.  -- eric@sourcegear.com
-
-  if (font_.GetID())
-    {
+  if (font_.GetID()) {

       hdc->SetFont(*font_.GetID());
     }
 }
       hdc->SetFont(*font_.GetID());
     }
 }


@@ -196,6 +199,12 @@ int Surface::LogPixelsY() {
     return hdc->GetPPI().y;
 }
 
     return hdc->GetPPI().y;
 }
 

+
+int Surface::DeviceHeightFont(int points) {
+    return points;
+}
+
+

 void Surface::MoveTo(int x_, int y_) {
     x = x_;
     y = y_;
 void Surface::MoveTo(int x_, int y_) {
     x = x_;
     y = y_;


@@ -240,7 +249,7 @@ void Surface::FillRectangle(PRectangle rc, Surface &surfacePattern) {
 void Surface::RoundedRectangle(PRectangle rc, Colour fore, Colour back) {
     PenColour(fore);
     BrushColor(back);
 void Surface::RoundedRectangle(PRectangle rc, Colour fore, Colour back) {
     PenColour(fore);
     BrushColor(back);

-    hdc->DrawRoundedRectangle(wxRectFromPRectangle(rc), 8);
+    hdc->DrawRoundedRectangle(wxRectFromPRectangle(rc), 4);

 }
 
 void Surface::Ellipse(PRectangle rc, Colour fore, Colour back) {
 }
 
 void Surface::Ellipse(PRectangle rc, Colour fore, Colour back) {


@@ -250,7 +259,8 @@ void Surface::Ellipse(PRectangle rc, Colour fore, Colour back) {
 }
 
 void Surface::Copy(PRectangle rc, Point from, Surface &surfaceSource) {
 }
 
 void Surface::Copy(PRectangle rc, Point from, Surface &surfaceSource) {

-    hdc->Blit(rc.left, rc.top, rc.Width(), rc.Height(),
+    wxRect r = wxRectFromPRectangle(rc);
+    hdc->Blit(r.x, r.y, r.width, r.height,

               surfaceSource.hdc, from.x, from.y, wxCOPY);
 }
 
               surfaceSource.hdc, from.x, from.y, wxCOPY);
 }
 


@@ -345,7 +355,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) {


@@ -353,9 +363,6 @@ void Surface::SetClip(PRectangle rc) {
 }
 
 void Surface::FlushCachedState() {
 }
 
 void Surface::FlushCachedState() {

-  // TODO Is there anything we need to do here? eric@sourcegear.com
-  // TODO I had to add this method when I merged new Scintilla code
-  // TODO from Neil.

 }
 
 Window::~Window() {
 }
 
 Window::~Window() {


@@ -377,7 +384,8 @@ PRectangle Window::GetPosition() {
 }
 
 void Window::SetPosition(PRectangle rc) {
 }
 
 void Window::SetPosition(PRectangle rc) {

-    id->SetSize(rc.left, rc.top, rc.Width(), rc.Height());
+    wxRect r = wxRectFromPRectangle(rc);
+    id->SetSize(r);

 }
 
 void Window::SetPositionRelative(PRectangle rc, Window) {
 }
 
 void Window::SetPositionRelative(PRectangle rc, Window) {


@@ -386,7 +394,7 @@ void Window::SetPositionRelative(PRectangle rc, Window) {
 
 PRectangle Window::GetClientPosition() {
     wxSize sz = id->GetClientSize();
 
 PRectangle Window::GetClientPosition() {
     wxSize sz = id->GetClientSize();

-    return  PRectangle(0, 0, sz.x - 1, sz.y - 1);
+    return  PRectangle(0, 0, sz.x, sz.y);

 }
 
 void Window::Show(bool show) {
 }
 
 void Window::Show(bool show) {


@@ -398,7 +406,8 @@ void Window::InvalidateAll() {
 }
 
 void Window::InvalidateRectangle(PRectangle rc) {
 }
 
 void Window::InvalidateRectangle(PRectangle rc) {

-    id->Refresh(false, &wxRectFromPRectangle(rc));
+    wxRect r = wxRectFromPRectangle(rc);
+    id->Refresh(false, &r);

 }
 
 void Window::SetFont(Font &font) {
 }
 
 void Window::SetFont(Font &font) {


@@ -444,6 +453,88 @@ void Window::SetTitle(const char *s) {
 }
 
 
 }
 
 

+//----------------------------------------------------------------------
+// Helper classes for ListBox
+
+// A wxListBox that gives focus to its parent if it gets it.
+class wxSTCListBox : public wxListBox {
+public:
+    wxSTCListBox(wxWindow* parent, wxWindowID id)
+        : wxListBox(parent, id, wxDefaultPosition, wxDefaultSize,
+                    0, NULL, wxLB_SINGLE | wxSIMPLE_BORDER)
+        {}
+
+    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()
+
+
+
+// A window to place the listbox upon.  If wxPopupWindow is supported then
+// that will be used so the listbox can extend beyond the client area of the
+// wxSTC if needed.
+
+#if wxUSE_POPUPWIN
+#include <wx/popupwin.h>
+#define wxSTCListBoxWinBase wxPopupWindow
+#define param2  wxBORDER_NONE  // popup's 2nd param is flags
+#else
+#define wxSTCListBoxWinBase wxWindow
+#define param2 -1 // wxWindows 2nd param is ID
+#endif
+
+class wxSTCListBoxWin : public wxSTCListBoxWinBase {
+public:
+    wxSTCListBoxWin(wxWindow* parent, wxWindowID id)
+        : wxSTCListBoxWinBase(parent, param2) {
+        lb = new wxSTCListBox(this, id);
+    }
+
+    void OnSize(wxSizeEvent& event) {
+        lb->SetSize(GetSize());
+    }
+    void OnFocus(wxFocusEvent& event) {
+        GetParent()->SetFocus();
+        event.Skip();
+    }
+
+    wxListBox* GetLB() { return lb; }
+
+#if wxUSE_POPUPWIN
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO) {
+        if (x != -1)
+            GetParent()->ClientToScreen(&x, NULL);
+        if (y != -1)
+            GetParent()->ClientToScreen(NULL, &y);
+        wxSTCListBoxWinBase::DoSetSize(x, y, width, height, sizeFlags);
+    }
+#endif
+
+private:
+    wxSTCListBox* lb;
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxSTCListBoxWinBase)
+    EVT_SIZE       (wxSTCListBoxWin::OnSize)
+    EVT_SET_FOCUS  (wxSTCListBoxWin::OnFocus)
+END_EVENT_TABLE()
+
+
+#define GETLB(win)  (((wxSTCListBoxWin*)win)->GetLB())
+
+//----------------------------------------------------------------------

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


@@ -452,42 +543,74 @@ 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 wxSTCListBoxWin(parent.id, ctrlID);
+}
+
+void ListBox::SetVisibleRows(int rows) {
+    desiredVisibleRows = rows;
+}
+
+PRectangle ListBox::GetDesiredRect() {
+    wxSize sz = GETLB(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) {
+    GETLB(id)->SetFont(*font.GetID());

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

-    ((wxListBox*)id)->Clear();
+    GETLB(id)->Clear();

 }
 
 void ListBox::Append(char *s) {
 }
 
 void ListBox::Append(char *s) {

-    ((wxListBox*)id)->Append(s);
+    GETLB(id)->Append(s);

 }
 
 int ListBox::Length() {
 }
 
 int ListBox::Length() {

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

 }
 
 void ListBox::Select(int n) {
 }
 
 void ListBox::Select(int n) {

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

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

-    return ((wxListBox*)id)->GetSelection();
+    return GETLB(id)->GetSelection();

 }
 
 int ListBox::Find(const char *prefix) {
 }
 
 int ListBox::Find(const char *prefix) {

-    return ((wxListBox*)id)->FindString(prefix);
+    // No longer used
+    return -1;

 }
 
 void ListBox::GetValue(int n, char *value, int len) {
 }
 
 void ListBox::GetValue(int n, char *value, int len) {

-    wxString text = ((wxListBox*)id)->GetString(n);
+    wxString text = GETLB(id)->GetString(n);

     strncpy(value, text.c_str(), len);
     value[len-1] = '\0';
 }
 
 void ListBox::Sort() {
     strncpy(value, text.c_str(), len);
     value[len-1] = '\0';
 }
 
 void ListBox::Sort() {

-    // wxWindows keeps sorted so no need to sort

 }
 
 
 }
 
 


@@ -513,13 +636,13 @@ void Menu::Show(Point pt, Window &w) {
 
 Colour Platform::Chrome() {
     wxColour c;
 
 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;
     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());
 }
 
     return Colour(c.Red(), c.Green(), c.Blue());
 }
 


@@ -582,6 +705,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;