// Robin Dunn <robin@aldunn.com>
// The License.txt file describes the conditions under which this software may be distributed.
+#include <ctype.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 >> 32);
+ return Point(lpoint & 0xFFFF, lpoint >> 16);
}
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 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) {
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,
- faceName);
+ faceName,
+ wxFONTENCODING_DEFAULT);
}
Release();
hdc = new wxMemoryDC();
hdcOwned = true;
- // **** ::SetTextAlign(hdc, TA_BASELINE);
}
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;
+ if (width < 1) width = 1;
+ if (height < 1) height = 1;
bitmap = new wxBitmap(width, height);
((wxMemoryDC*)hdc)->SelectObject(*bitmap);
- // **** ::SetTextAlign(hdc, TA_BASELINE);
}
void Surface::PenColour(Colour fore) {
}
void Surface::SetFont(Font &font_) {
- hdc->SetFont(*font_.GetID());
+ if (font_.GetID()) {
+ hdc->SetFont(*font_.GetID());
+ }
}
int Surface::LogPixelsY() {
return hdc->GetPPI().y;
}
+
+int Surface::DeviceHeightFont(int points) {
+ return points;
+}
+
+
void Surface::MoveTo(int x_, int y_) {
x = x_;
y = y_;
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::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);
}
}
int Surface::SetPalette(Palette *pal, bool inBackGround) {
- return 0; // **** figure out what to do with palettes...
+ return 0;
}
void Surface::SetClip(PRectangle rc) {
hdc->SetClippingRegion(wxRectFromPRectangle(rc));
}
-
+void Surface::FlushCachedState() {
+}
Window::~Window() {
}
}
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) {
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::InvalidateRectangle(PRectangle rc) {
- id->Refresh(false, &wxRectFromPRectangle(rc));
+ wxRect r = wxRectFromPRectangle(rc);
+ id->Refresh(false, &r);
}
void Window::SetFont(Font &font) {
}
+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() {
}
}
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() {
}
int ListBox::Length() {
- return ((wxListBox*)id)->Number();
+ return ((wxListBox*)id)->GetCount();
}
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::Find(const char *prefix) {
- return ((wxListBox*)id)->FindString(prefix);
+ // No longer used
+ return -1;
}
void ListBox::GetValue(int n, char *value, int len) {
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());
}
#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;
projects / wxWidgets.git / blobdiff