#include <wx/wx.h>
#endif
-#include <wx/wxexpr.h>
+#if wxUSE_PROLOGIO
+#include <wx/deprecated/wxexpr.h>
+#endif
#include <wx/types.h>
#include <math.h>
#include <stdlib.h>
-#include <wx/ogl/basic.h>
-#include <wx/ogl/basicp.h>
-#include <wx/ogl/misc.h>
-#include <wx/ogl/constrnt.h>
-#include <wx/ogl/composit.h>
+#include "wx/ogl/ogl.h"
+
wxFont* g_oglNormalFont;
wxPen* g_oglBlackPen;
wxPen* g_oglBlackForegroundPen;
wxCursor* g_oglBullseyeCursor = NULL;
-char* oglBuffer = NULL;
+wxChar* oglBuffer = NULL;
wxList oglObjectCopyMapping(wxKEY_INTEGER);
g_oglNormalFont = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL);
- g_oglBlackPen = new wxPen("BLACK", 1, wxSOLID);
+ g_oglBlackPen = new wxPen(wxT("BLACK"), 1, wxSOLID);
- g_oglWhiteBackgroundPen = new wxPen("WHITE", 1, wxSOLID);
- g_oglTransparentPen = new wxPen("WHITE", 1, wxTRANSPARENT);
- g_oglWhiteBackgroundBrush = new wxBrush("WHITE", wxSOLID);
- g_oglBlackForegroundPen = new wxPen("BLACK", 1, wxSOLID);
+ g_oglWhiteBackgroundPen = new wxPen(wxT("WHITE"), 1, wxSOLID);
+ g_oglTransparentPen = new wxPen(wxT("WHITE"), 1, wxTRANSPARENT);
+ g_oglWhiteBackgroundBrush = new wxBrush(wxT("WHITE"), wxSOLID);
+ g_oglBlackForegroundPen = new wxPen(wxT("BLACK"), 1, wxSOLID);
OGLInitializeConstraintTypes();
// Initialize big buffer used when writing images
- oglBuffer = new char[3000];
+ oglBuffer = new wxChar[3000];
}
oglBuffer = NULL;
}
oglBuffer = NULL;
+
if (g_oglBullseyeCursor)
{
delete g_oglBullseyeCursor;
{
if (old_size <= 0)
old_size = 10;
- char buf[40];
- sprintf(buf, "%d", old_size);
- wxString ans = wxGetTextFromUser("Enter point size", "Font size", buf, parent);
- if (ans == "")
+ wxString buf;
+ buf << old_size;
+ wxString ans = wxGetTextFromUser(wxT("Enter point size"), wxT("Font size"), buf, parent);
+ if (ans.Length() == 0)
return 0;
- int new_size = atoi(ans);
+ long new_size = 0;
+ ans.ToLong(&new_size);
if ((new_size <= 0) || (new_size > 40))
{
- wxMessageBox("Invalid point size!", "Error", wxOK);
+ wxMessageBox(wxT("Invalid point size!"), wxT("Error"), wxOK);
return 0;
}
return new_size;
if (current_width > max_width)
max_width = current_width;
- current = current->Next();
+ current = current->GetNext();
i ++;
}
double y = (double)(i*char_height + yoffset);
line->SetX( x - xOffset ); line->SetY( y - yOffset );
- current = current->Next();
+ current = current->GetNext();
i ++;
}
if (current_width > max_width)
max_width = current_width;
- current = current->Next();
+ current = current->GetNext();
i ++;
}
double y = (double)(i*char_height + yoffset);
line->SetX( x - m_xpos ); line->SetY( y - m_ypos );
- current = current->Next();
+ current = current->GetNext();
i ++;
}
delete widths;
}
void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
- double m_xpos, double m_ypos, double width, double height,
+ double WXUNUSED(m_xpos), double WXUNUSED(m_ypos), double WXUNUSED(width), double WXUNUSED(height),
double *actual_width, double *actual_height)
{
int n = text_list->GetCount();
long current_width = 0;
wxNode *current = text_list->GetFirst();
- int i = 0;
while (current)
{
wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
if (current_width > max_width)
max_width = current_width;
- current = current->Next();
- i ++;
+ current = current->GetNext();
}
*actual_height = n*char_height;
// Format a string to a list of strings that fit in the given box.
// Interpret %n and 10 or 13 as a new line.
-wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double height, int formatMode)
+wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double WXUNUSED(height), int formatMode)
{
// First, parse the string into a list of words
wxStringList word_list;
// Make new lines into NULL strings at this point
- int i = 0; int j = 0; int len = strlen(text);
- char word[200]; word[0] = 0;
+ int i = 0; int j = 0; int len = text.Length();
+ wxChar word[200]; word[0] = 0;
bool end_word = FALSE; bool new_line = FALSE;
while (i < len)
{
switch (text[i])
{
- case '%':
+ case wxT('%'):
{
i ++;
if (i == len)
- { word[j] = '%'; j ++; }
+ { word[j] = wxT('%'); j ++; }
else
{
- if (text[i] == 'n')
+ if (text[i] == wxT('n'))
{ new_line = TRUE; end_word = TRUE; i++; }
else
- { word[j] = '%'; j ++; word[j] = text[i]; j ++; i ++; }
+ { word[j] = wxT('%'); j ++; word[j] = text[i]; j ++; i ++; }
}
break;
}
{
new_line = TRUE; end_word = TRUE; i++;
}
- case ' ':
+ case wxT(' '):
{
end_word = TRUE;
i ++;
// Now, make a list of strings which can fit in the box
wxStringList *string_list = new wxStringList;
- char buffer[400];
- buffer[0] = 0;
- wxNode *node = word_list.First();
+ wxString buffer;
+ wxStringListNode *node = word_list.GetFirst();
long x, y;
while (node)
{
wxString oldBuffer(buffer);
- char *s = (char *)node->GetData();
+ wxChar *s = (wxChar *)node->GetData();
if (!s)
{
// FORCE NEW LINE
- if (strlen(buffer) > 0)
+ if (buffer.Length() > 0)
string_list->Add(buffer);
- buffer[0] = 0;
+ buffer.Empty();
}
else
{
- if (buffer[0] != 0)
- strcat(buffer, " ");
+ if (buffer.Length() != 0)
+ buffer += wxT(" ");
- strcat(buffer, s);
+ buffer += s;
dc.GetTextExtent(buffer, &x, &y);
// Don't fit within the bounding box if we're fitting shape to contents
if (oldBuffer.Length() > 0)
string_list->Add(oldBuffer);
- buffer[0] = 0;
- strcat(buffer, s);
+ buffer.Empty();
+ buffer += s;
}
}
- node = node->Next();
+ node = node->GetNext();
}
- if (buffer[0] != 0)
+ if (buffer.Length() != 0)
string_list->Add(buffer);
return string_list;
wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
dc.DrawText(line->GetText(), WXROUND(xoffset + line->GetX()), WXROUND(yoffset + line->GetY()));
- current = current->Next();
+ current = current->GetNext();
}
dc.DestroyClippingRegion();
wxRealPoint *point = (wxRealPoint *)node->GetData();
xcount += point->x;
ycount += point->y;
- node = node->Next();
+ node = node->GetNext();
}
*x = (xcount/points->GetCount());
wxNode *node = list->GetFirst();
while (node)
{
- char *s = (char *)node->GetData();
+ wxChar *s = (wxChar *)node->GetData();
item->Append(s);
- node = node->Next();
+ node = node->GetNext();
}
}
*/
// Array used in DecToHex conversion routine.
-static char sg_HexArray[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
- 'C', 'D', 'E', 'F' };
+static wxChar sg_HexArray[] = { wxT('0'), wxT('1'), wxT('2'), wxT('3'),
+ wxT('4'), wxT('5'), wxT('6'), wxT('7'),
+ wxT('8'), wxT('9'), wxT('A'), wxT('B'),
+ wxT('C'), wxT('D'), wxT('E'), wxT('F')
+};
// Convert 2-digit hex number to decimal
-unsigned int oglHexToDec(char* buf)
+unsigned int oglHexToDec(wxChar* buf)
{
int firstDigit, secondDigit;
- if (buf[0] >= 'A')
- firstDigit = buf[0] - 'A' + 10;
+ if (buf[0] >= wxT('A'))
+ firstDigit = buf[0] - wxT('A') + 10;
else
- firstDigit = buf[0] - '0';
+ firstDigit = buf[0] - wxT('0');
- if (buf[1] >= 'A')
- secondDigit = buf[1] - 'A' + 10;
+ if (buf[1] >= wxT('A'))
+ secondDigit = buf[1] - wxT('A') + 10;
else
- secondDigit = buf[1] - '0';
+ secondDigit = buf[1] - wxT('0');
return firstDigit * 16 + secondDigit;
}
// Convert decimal integer to 2-character hex string
-void oglDecToHex(unsigned int dec, char *buf)
+void oglDecToHex(unsigned int dec, wxChar *buf)
{
int firstDigit = (int)(dec/16.0);
int secondDigit = (int)(dec - (firstDigit*16.0));
wxColour oglHexToColour(const wxString& hex)
{
if (hex.Length() == 6)
- {
- char buf[7];
- strncpy(buf, hex, 7);
- unsigned int r = oglHexToDec((char *)buf);
- unsigned int g = oglHexToDec((char *)(buf+2));
- unsigned int b = oglHexToDec((char *)(buf+4));
+ {
+ long r, g, b;
+ r = g = b = 0;
+ hex.Mid(0,2).ToLong(&r, 16);
+ hex.Mid(2,2).ToLong(&g, 16);
+ hex.Mid(4,2).ToLong(&b, 16);
return wxColour(r, g, b);
- }
- else
- return wxColour(0,0,0);
+ }
+ else
+ return wxColour(0,0,0);
}
// RGB to 3-digit hex
wxString oglColourToHex(const wxColour& colour)
{
- char buf[7];
+ wxChar buf[7];
unsigned int red = colour.Red();
unsigned int green = colour.Green();
unsigned int blue = colour.Blue();
projects / wxWidgets.git / blobdiff