// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include "wx/menu.h"
#include "wx/stattext.h"
#include "wx/button.h"
+#include "wx/bmpbuttn.h"
#include "wx/radiobox.h"
#include "wx/listbox.h"
#include "wx/choice.h"
#include "wx/checkbox.h"
#include "wx/slider.h"
#include "wx/statbox.h"
-#if USE_GAUGE
+#if wxUSE_GAUGE
#include "wx/gauge.h"
#endif
#include "wx/textctrl.h"
-#include "wx/msgbxdlg.h"
+#include "wx/msgdlg.h"
+#include "wx/intl.h"
#endif
-#if USE_SCROLLBAR
+#if wxUSE_SCROLLBAR
#include "wx/scrolbar.h"
#endif
-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX
#include "wx/combobox.h"
#endif
#include "wx/validate.h"
-#if USE_WX_RESOURCES
+#include "wx/log.h"
+
+#if wxUSE_WX_RESOURCES
#include <ctype.h>
#include <math.h>
// Interpret list expression
wxFont *wxResourceInterpretFontSpec(PrologExpr *expr);
-bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResourceTable *table = NULL);
-bool wxResourceParseIncludeFile(char *f, wxResourceTable *table = NULL);
+bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResourceTable *table = (wxResourceTable *) NULL);
+bool wxResourceParseIncludeFile(char *f, wxResourceTable *table = (wxResourceTable *) NULL);
-wxResourceTable *wxDefaultResourceTable = NULL;
+wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL;
-static char *wxResourceBuffer = NULL;
+static char *wxResourceBuffer = (char *) NULL;
static long wxResourceBufferSize = 0;
static long wxResourceBufferCount = 0;
static int wxResourceStringPtr = 0;
void wxCleanUpResourceSystem(void)
{
delete wxDefaultResourceTable;
+ if (wxResourceBuffer)
+ delete[] wxResourceBuffer;
}
-void wxWarning(char *msg)
+void wxLogWarning(char *msg)
{
- wxMessageBox(msg, "Warning", wxOK);
+ wxMessageBox(msg, _("Warning"), wxOK);
}
#if !USE_SHARED_LIBRARY
wxItemResource::wxItemResource(void)
{
- itemType = NULL;
- title = NULL;
- name = NULL;
+ itemType = (char *) NULL;
+ title = (char *) NULL;
+ name = (char *) NULL;
windowStyle = 0;
x = y = width = height = 0;
value1 = value2 = value3 = value5 = 0;
- value4 = NULL;
- stringValues = NULL;
- bitmap = NULL;
- backgroundColour = labelColour = buttonColour = NULL;
- windowFont = NULL;
+ value4 = (char *) NULL;
+ stringValues = (wxStringList *) NULL;
+ bitmap = (wxBitmap *) NULL;
+ backgroundColour = labelColour = buttonColour = (wxColour *) NULL;
+ windowFont = (wxFont *) NULL;
m_windowId = 0;
}
if (t)
title = copystring(t);
else
- title = NULL;
+ title = (char *) NULL;
}
void wxItemResource::SetType(char *t)
if (t)
itemType = copystring(t);
else
- itemType = NULL;
+ itemType = (char *) NULL;
}
void wxItemResource::SetName(char *n)
if (n)
name = copystring(n);
else
- name = NULL;
+ name = (char *) NULL;
}
void wxItemResource::SetStringValues(wxStringList *svalues)
if (svalues)
stringValues = svalues;
else
- stringValues = NULL;
+ stringValues = (wxStringList *) NULL;
}
void wxItemResource::SetValue4(char *v)
if (v)
value4 = copystring(v);
else
- value4 = NULL;
+ value4 = (char *) NULL;
}
/*
// See if any resource has this as its child; if so, delete from
// parent's child list.
BeginFind();
- wxNode *node = NULL;
+ wxNode *node = (wxNode *) NULL;
while ((node = Next()))
{
wxItemResource *parent = (wxItemResource *)node->Data();
PrologDatabase db;
if (!db.ReadPrologFromString(data))
{
- wxWarning("Ill-formed resource file syntax.");
+ wxLogWarning(_("Ill-formed resource file syntax."));
return FALSE;
}
{
int id = childResource->GetId();
if ( id == 0 )
- id = -1;
+ id = -1;
- wxControl *control = NULL;
+ wxControl *control = (wxControl *) NULL;
wxString itemType(childResource->GetType());
if (itemType == wxString("wxButton") || itemType == wxString("wxBitmapButton"))
{
if (bitmap)
control = new wxBitmapButton(parent, id, *bitmap,
wxPoint(childResource->GetX(), childResource->GetY()),
- wxSize(childResource->GetWidth(), childResource->GetHeight()),
- childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
+ wxSize(childResource->GetWidth(), childResource->GetHeight()),
+ childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
}
else
// Normal, text button
control = new wxButton(parent, id, childResource->GetTitle(),
wxPoint(childResource->GetX(), childResource->GetY()),
- wxSize(childResource->GetWidth(), childResource->GetHeight()),
+ wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
}
else if (itemType == wxString("wxMessage") || itemType == wxString("wxStaticText") ||
- itemType == wxString("wxStaticBitmap"))
+ itemType == wxString("wxStaticBitmap"))
{
if (childResource->GetValue4())
{
bitmap = wxResourceCreateBitmap(childResource->GetValue4(), (wxResourceTable *)this);
childResource->SetBitmap(bitmap);
}
-#if USE_BITMAP_MESSAGE
+#if wxUSE_BITMAP_MESSAGE
if (bitmap)
control = new wxStaticBitmap(parent, id, *bitmap,
wxPoint(childResource->GetX(), childResource->GetY()),
- wxSize(childResource->GetWidth(), childResource->GetHeight()),
+ wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), childResource->GetName());
#endif
}
{
control = new wxStaticText(parent, id, childResource->GetTitle(),
wxPoint(childResource->GetX(), childResource->GetY()),
- wxSize(childResource->GetWidth(), childResource->GetHeight()),
+ wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), childResource->GetName());
}
}
{
control = new wxTextCtrl(parent, id, childResource->GetValue4(),
wxPoint(childResource->GetX(), childResource->GetY()),
- wxSize(childResource->GetWidth(), childResource->GetHeight()),
+ wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
}
else if (itemType == wxString("wxCheckBox"))
{
control = new wxCheckBox(parent, id, childResource->GetTitle(),
wxPoint(childResource->GetX(), childResource->GetY()),
- wxSize(childResource->GetWidth(), childResource->GetHeight()),
+ wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
((wxCheckBox *)control)->SetValue((childResource->GetValue1() != 0));
}
-#if USE_GAUGE
+#if wxUSE_GAUGE
else if (itemType == wxString("wxGauge"))
{
control = new wxGauge(parent, id, (int)childResource->GetValue2(),
wxPoint(childResource->GetX(), childResource->GetY()),
- wxSize(childResource->GetWidth(), childResource->GetHeight()),
+ wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
((wxGauge *)control)->SetValue((int)childResource->GetValue1());
}
#endif
-#if USE_RADIOBUTTON
+#if wxUSE_RADIOBUTTON
else if (itemType == wxString("wxRadioButton"))
{
control = new wxRadioButton(parent, id, childResource->GetTitle(), // (int)childResource->GetValue1(),
wxPoint(childResource->GetX(), childResource->GetY()),
- wxSize(childResource->GetWidth(), childResource->GetHeight()),
+ wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
}
#endif
-#if USE_SCROLLBAR
+#if wxUSE_SCROLLBAR
else if (itemType == wxString("wxScrollBar"))
{
control = new wxScrollBar(parent, id,
{
control = new wxStaticBox(parent, id, childResource->GetTitle(),
wxPoint(childResource->GetX(), childResource->GetY()),
- wxSize(childResource->GetWidth(), childResource->GetHeight()),
+ wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), childResource->GetName());
}
else if (itemType == wxString("wxListBox"))
{
wxStringList *stringList = childResource->GetStringValues();
- wxString *strings = NULL;
+ wxString *strings = (wxString *) NULL;
int noStrings = 0;
if (stringList && (stringList->Number() > 0))
{
}
control = new wxListBox(parent, id,
wxPoint(childResource->GetX(), childResource->GetY()),
- wxSize(childResource->GetWidth(), childResource->GetHeight()),
+ wxSize(childResource->GetWidth(), childResource->GetHeight()),
noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
if (strings)
else if (itemType == wxString("wxChoice"))
{
wxStringList *stringList = childResource->GetStringValues();
- wxString *strings = NULL;
+ wxString *strings = (wxString *) NULL;
int noStrings = 0;
if (stringList && (stringList->Number() > 0))
{
}
control = new wxChoice(parent, id,
wxPoint(childResource->GetX(), childResource->GetY()),
- wxSize(childResource->GetWidth(), childResource->GetHeight()),
+ wxSize(childResource->GetWidth(), childResource->GetHeight()),
noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
if (strings)
delete[] strings;
}
-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX
else if (itemType == wxString("wxComboBox"))
{
wxStringList *stringList = childResource->GetStringValues();
- wxString *strings = NULL;
+ wxString *strings = (wxString *) NULL;
int noStrings = 0;
if (stringList && (stringList->Number() > 0))
{
}
control = new wxComboBox(parent, id, childResource->GetValue4(),
wxPoint(childResource->GetX(), childResource->GetY()),
- wxSize(childResource->GetWidth(), childResource->GetHeight()),
+ wxSize(childResource->GetWidth(), childResource->GetHeight()),
noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
if (strings)
else if (itemType == wxString("wxRadioBox"))
{
wxStringList *stringList = childResource->GetStringValues();
- wxString *strings = NULL;
+ wxString *strings = (wxString *) NULL;
int noStrings = 0;
if (stringList && (stringList->Number() > 0))
{
}
control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()),
wxPoint(childResource->GetX(), childResource->GetY()),
- wxSize(childResource->GetWidth(), childResource->GetHeight()),
+ wxSize(childResource->GetWidth(), childResource->GetHeight()),
noStrings, strings, (int)childResource->GetValue1(), childResource->GetStyle(), wxDefaultValidator,
- childResource->GetName());
+ childResource->GetName());
if (strings)
delete[] strings;
while (node)
{
PrologExpr *clause = (PrologExpr *)node->Data();
- wxString functor(clause->Functor());
+ wxString functor(clause->Functor());
- wxItemResource *item = NULL;
+ wxItemResource *item = (wxItemResource *) NULL;
if (functor == "dialog")
item = wxResourceInterpretDialog(table, clause);
else if (functor == "panel")
static bool wxIsValidControlClass(const wxString& c)
{
- int i;
- for ( i = 0; i < g_ValidControlClassesCount; i++)
- {
- if ( c == g_ValidControlClasses[i] )
- return TRUE;
- }
- return FALSE;
+ int i;
+ for ( i = 0; i < g_ValidControlClassesCount; i++)
+ {
+ if ( c == g_ValidControlClasses[i] )
+ return TRUE;
+ }
+ return FALSE;
}
wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *expr, bool isPanel)
dialogItem->SetType("wxPanel");
else
dialogItem->SetType("wxDialog");
- char *style = NULL;
- char *title = NULL;
- char *name = NULL;
- char *backColourHex = NULL;
- char *labelColourHex = NULL;
- char *buttonColourHex = NULL;
+ char *style = (char *) NULL;
+ char *title = (char *) NULL;
+ char *name = (char *) NULL;
+ char *backColourHex = (char *) NULL;
+ char *labelColourHex = (char *) NULL;
+ char *buttonColourHex = (char *) NULL;
long windowStyle = wxDEFAULT_DIALOG_STYLE;
if (isPanel)
int x = 0; int y = 0; int width = -1; int height = -1;
int isModal = 0;
- PrologExpr *labelFontExpr = NULL;
- PrologExpr *buttonFontExpr = NULL;
- PrologExpr *fontExpr = NULL;
+ PrologExpr *labelFontExpr = (PrologExpr *) NULL;
+ PrologExpr *buttonFontExpr = (PrologExpr *) NULL;
+ PrologExpr *fontExpr = (PrologExpr *) NULL;
expr->AssignAttributeValue("style", &style);
expr->AssignAttributeValue("name", &name);
expr->AssignAttributeValue("title", &title);
if ( expr1->Type() == PrologString || expr1->Type() == PrologWord )
{
- if ( wxIsValidControlClass(expr1->StringValue()) )
- {
- count = 1;
- controlType = expr1->StringValue();
- }
- else
- {
+ if ( wxIsValidControlClass(expr1->StringValue()) )
+ {
+ count = 1;
+ controlType = expr1->StringValue();
+ }
+ else
+ {
wxString str(expr1->StringValue());
id = wxResourceGetIdentifier(WXSTRINGCAST str, &table);
if (id == 0)
{
- char buf[300];
- sprintf(buf, "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n or provide #define (see manual for caveats)",
- (const char*) expr1->StringValue());
- wxWarning(buf);
- delete controlItem;
- return NULL;
+ wxLogWarning(_("Could not resolve control class or id '%s'. "
+ "Use (non-zero) integer instead\n or provide #define "
+ "(see manual for caveats)"),
+ (const char*) expr1->StringValue());
+ delete controlItem;
+ return (wxItemResource *) NULL;
}
- else
- {
- // Success - we have an id, so the 2nd element must be the control class.
- controlType = expr->Nth(1)->StringValue();
- count = 2;
- }
- }
+ else
+ {
+ // Success - we have an id, so the 2nd element must be the control class.
+ controlType = expr->Nth(1)->StringValue();
+ count = 2;
+ }
+ }
}
else if (expr1->Type() == PrologInteger)
{
id = (int)expr1->IntegerValue();
- // Success - we have an id, so the 2nd element must be the control class.
- controlType = expr->Nth(1)->StringValue();
- count = 2;
+ // Success - we have an id, so the 2nd element must be the control class.
+ controlType = expr->Nth(1)->StringValue();
+ count = 2;
}
expr1 = expr->Nth(count);
count ++;
if ( expr1 )
- title = expr1->StringValue();
+ title = expr1->StringValue();
expr1 = expr->Nth(count);
count ++;
{
// Check for default value
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
+ {
controlItem->SetValue1(expr->Nth(count)->IntegerValue());
- count ++;
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
}
}
-#if USE_RADIOBUTTON
+#if wxUSE_RADIOBUTTON
else if (controlType == "wxRadioButton")
{
// Check for default value
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
+ {
controlItem->SetValue1(expr->Nth(count)->IntegerValue());
- count ++;
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
}
}
#endif
- else if (controlType == "wxText" || controlType == "wxTextCtrl")
+ else if (controlType == "wxText" || controlType == "wxTextCtrl" || controlType == "wxMultiText")
{
// Check for default value
if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
- {
+ {
wxString str(expr->Nth(count)->StringValue());
controlItem->SetValue4(WXSTRINGCAST str);
- count ++;
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- {
+ {
// controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- // Do nothing - no label font any more
- count ++;
+ // Do nothing - no label font any more
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
+ }
+ }
}
else if (controlType == "wxMessage" || controlType == "wxStaticText")
{
{
// Check for default value
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
+ {
controlItem->SetValue1(expr->Nth(count)->IntegerValue());
- count ++;
+ count ++;
// Check for range
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
+ {
controlItem->SetValue2(expr->Nth(count)->IntegerValue());
- count ++;
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
{
- // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- // Do nothing
- count ++;
+ // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
+ // Do nothing
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
- }
+ }
+ }
+ }
}
else if (controlType == "wxSlider")
{
// Check for default value
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
+ {
controlItem->SetValue1(expr->Nth(count)->IntegerValue());
- count ++;
+ count ++;
// Check for min
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
+ {
controlItem->SetValue2(expr->Nth(count)->IntegerValue());
- count ++;
+ count ++;
// Check for max
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
+ {
controlItem->SetValue3(expr->Nth(count)->IntegerValue());
- count ++;
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- {
+ {
// controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- // do nothing
- count ++;
+ // do nothing
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
- }
- }
+ }
+ }
+ }
+ }
}
else if (controlType == "wxScrollBar")
{
// DEFAULT VALUE
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
+ {
controlItem->SetValue1(expr->Nth(count)->IntegerValue());
- count ++;
+ count ++;
// PAGE LENGTH
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
+ {
controlItem->SetValue2(expr->Nth(count)->IntegerValue());
- count ++;
+ count ++;
// OBJECT LENGTH
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
+ {
controlItem->SetValue3(expr->Nth(count)->IntegerValue());
- count ++;
+ count ++;
// VIEW LENGTH
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
controlItem->SetValue5(expr->Nth(count)->IntegerValue());
- }
- }
- }
+ }
+ }
+ }
}
else if (controlType == "wxListBox")
{
- PrologExpr *valueList = NULL;
+ PrologExpr *valueList = (PrologExpr *) NULL;
if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
{
stringExpr = stringExpr->GetNext();
}
controlItem->SetStringValues(stringList);
- count ++;
+ count ++;
// Check for wxSINGLE/wxMULTIPLE
- PrologExpr *mult = NULL;
+ PrologExpr *mult = (PrologExpr *) NULL;
controlItem->SetValue1(wxLB_SINGLE);
if ((mult = expr->Nth(count)) && ((mult->Type() == PrologString)||(mult->Type() == PrologWord)))
{
controlItem->SetValue1(wxLB_MULTIPLE);
else if (m == "wxEXTENDED")
controlItem->SetValue1(wxLB_EXTENDED);
- count ++;
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- {
+ {
// controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- count ++;
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
- }
+ }
+ }
+ }
}
else if (controlType == "wxChoice")
{
- PrologExpr *valueList = NULL;
+ PrologExpr *valueList = (PrologExpr *) NULL;
// Check for default value list
if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
{
}
controlItem->SetStringValues(stringList);
- count ++;
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- {
+ {
// controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- count ++;
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
+ }
+ }
}
-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX
else if (controlType == "wxComboBox")
{
PrologExpr *textValue = expr->Nth(count);
if (textValue && (textValue->Type() == PrologString || textValue->Type() == PrologWord))
- {
+ {
wxString str(textValue->StringValue());
controlItem->SetValue4(WXSTRINGCAST str);
- count ++;
+ count ++;
- PrologExpr *valueList = NULL;
+ PrologExpr *valueList = (PrologExpr *) NULL;
// Check for default value list
if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
{
}
controlItem->SetStringValues(stringList);
- count ++;
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- {
+ {
// controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- count ++;
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
- }
+ }
+ }
+ }
}
#endif
-#if 0
+#if 1
else if (controlType == "wxRadioBox")
{
- PrologExpr *valueList = NULL;
+ PrologExpr *valueList = (PrologExpr *) NULL;
// Check for default value list
if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
{
stringExpr = stringExpr->GetNext();
}
controlItem->SetStringValues(stringList);
- count ++;
+ count ++;
// majorDim (number of rows or cols)
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
+ {
controlItem->SetValue1(expr->Nth(count)->IntegerValue());
- count ++;
- }
+ count ++;
+ }
else
controlItem->SetValue1(0);
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- {
+ {
// controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- count ++;
+ count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
+ }
+ }
}
#endif
else
{
delete controlItem;
- return NULL;
+ return (wxItemResource *) NULL;
}
return controlItem;
}
id = wxResourceGetIdentifier(WXSTRINGCAST str, &table);
if (id == 0)
{
- char buf[300];
- sprintf(buf, "Could not resolve menu id '%s'. Use (non-zero) integer instead\n or provide #define (see manual for caveats)",
- (const char*) idExpr->StringValue());
- wxWarning(buf);
+ wxLogWarning(_("Could not resolve menu id '%s'. "
+ "Use (non-zero) integer instead\n"
+ "or provide #define (see manual for caveats)"),
+ (const char*) idExpr->StringValue());
}
}
else if (idExpr->Type() == PrologInteger)
wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, PrologExpr *expr)
{
- PrologExpr *listExpr = NULL;
+ PrologExpr *listExpr = (PrologExpr *) NULL;
expr->AssignAttributeValue("menu", &listExpr);
if (!listExpr)
- return NULL;
+ return (wxItemResource *) NULL;
wxItemResource *menuResource = wxResourceInterpretMenuItem(table, listExpr);
if (!menuResource)
- return NULL;
+ return (wxItemResource *) NULL;
- char *name = NULL;
+ char *name = (char *) NULL;
expr->AssignAttributeValue("name", &name);
if (name)
{
wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, PrologExpr *expr)
{
- PrologExpr *listExpr = NULL;
+ PrologExpr *listExpr = (PrologExpr *) NULL;
expr->AssignAttributeValue("menu", &listExpr);
if (!listExpr)
- return NULL;
+ return (wxItemResource *) NULL;
wxItemResource *resource = new wxItemResource;
resource->SetType("wxMenu");
element = element->GetNext();
}
- char *name = NULL;
+ char *name = (char *) NULL;
expr->AssignAttributeValue("name", &name);
if (name)
{
wxItemResource *wxResourceInterpretString(wxResourceTable& WXUNUSED(table), PrologExpr *WXUNUSED(expr))
{
- return NULL;
+ return (wxItemResource *) NULL;
}
wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), PrologExpr *expr)
wxItemResource *bitmapItem = new wxItemResource;
// bitmapItem->SetType(wxTYPE_BITMAP);
bitmapItem->SetType("wxBitmap");
- char *name = NULL;
+ char *name = (char *) NULL;
expr->AssignAttributeValue("name", &name);
if (name)
{
return item;
}
else
- return NULL;
+ return (wxItemResource *) NULL;
}
// Interpret list expression as a font
wxFont *wxResourceInterpretFontSpec(PrologExpr *expr)
{
if (expr->Type() != PrologList)
- return NULL;
+ return (wxFont *) NULL;
int point = 10;
int family = wxSWISS;
if (faceNameExpr)
faceName = faceNameExpr->StringValue();
- char *faceName1 = NULL;
+ char *faceName1 = (char *) NULL;
if (faceName != "")
faceName1 = WXSTRINGCAST faceName;
wxFont *font = wxTheFontList->FindOrCreateFont(point, family, style, weight, (underline != 0), faceName1);
}
else
{
- char buf[300];
- sprintf(buf, "#define %s must be an integer.", name);
- wxWarning(buf);
+ wxLogWarning(_("#define %s must be an integer."), name);
delete[] name;
delete[] value;
return FALSE;
name[len-1] = 0;
if (!wxResourceParseIncludeFile(actualName, table))
{
- char buf[400];
- sprintf(buf, "Could not find resource include file %s.", actualName);
- wxWarning(buf);
+ wxLogWarning(_("Could not find resource include file %s."), actualName);
}
delete[] name;
return TRUE;
else if (strcmp(wxResourceBuffer, "static") != 0)
{
char buf[300];
- strcpy(buf, "Found ");
+ strcpy(buf, _("Found "));
strncat(buf, wxResourceBuffer, 30);
- strcat(buf, ", expected static, #include or #define\nwhilst parsing resource.");
- wxWarning(buf);
+ strcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+ wxLogWarning(buf);
return FALSE;
}
// char
if (!wxGetResourceToken(fd))
{
- wxWarning("Unexpected end of file whilst parsing resource.");
+ wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE;
return FALSE;
}
if (strcmp(wxResourceBuffer, "char") != 0)
{
- wxWarning("Expected 'char' whilst parsing resource.");
+ wxLogWarning(_("Expected 'char' whilst parsing resource."));
return FALSE;
}
// *name
if (!wxGetResourceToken(fd))
{
- wxWarning("Unexpected end of file whilst parsing resource.");
+ wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE;
return FALSE;
}
if (wxResourceBuffer[0] != '*')
{
- wxWarning("Expected '*' whilst parsing resource.");
+ wxLogWarning(_("Expected '*' whilst parsing resource."));
return FALSE;
}
char nameBuf[100];
// =
if (!wxGetResourceToken(fd))
{
- wxWarning("Unexpected end of file whilst parsing resource.");
+ wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE;
return FALSE;
}
if (strcmp(wxResourceBuffer, "=") != 0)
{
- wxWarning("Expected '=' whilst parsing resource.");
+ wxLogWarning(_("Expected '=' whilst parsing resource."));
return FALSE;
}
// String
if (!wxGetResourceToken(fd))
{
- wxWarning("Unexpected end of file whilst parsing resource.");
+ wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE;
return FALSE;
}
{
if (!db.ReadPrologFromString(wxResourceBuffer))
{
- char buf[300];
- sprintf(buf, "%s: ill-formed resource file syntax.", nameBuf);
- wxWarning(buf);
+ wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
return FALSE;
}
}
char *wxResourceParseWord(char *s, int *i)
{
if (!s)
- return NULL;
+ return (char *) NULL;
static char buf[150];
int len = strlen(s);
}
*i = ii;
if (j == 0)
- return NULL;
+ return (char *) NULL;
else
return buf;
}
{ "wxLB_SINGLE", wxLB_SINGLE },
{ "wxLB_MULTIPLE", wxLB_MULTIPLE },
{ "wxLB_EXTENDED", wxLB_EXTENDED },
- { "wxNEEDED_SB", wxNEEDED_SB },
- { "wxALWAYS_SB", wxALWAYS_SB },
{ "wxLB_NEEDED_SB", wxLB_NEEDED_SB },
{ "wxLB_ALWAYS_SB", wxLB_ALWAYS_SB },
{ "wxLB_SORT", wxLB_SORT },
{ "wxDEFAULT_DIALOG_STYLE", wxDEFAULT_DIALOG_STYLE},
{ "wxBORDER", wxBORDER},
{ "wxRETAINED", wxRETAINED},
- { "wxEDITABLE", wxEDITABLE},
- { "wxREADONLY", wxREADONLY},
{ "wxNATIVE_IMPL", 0},
{ "wxEXTENDED_IMPL", 0},
{ "wxBACKINGSTORE", wxBACKINGSTORE},
}
if (!found)
{
- char buf[200];
- sprintf(buf, "Unrecognized style %s whilst parsing resource.", word);
- wxWarning(buf);
+ wxLogWarning(_("Unrecognized style %s whilst parsing resource."), word);
return 0;
}
}
{
if (!item->GetType() || strcmp(item->GetType(), "wxBitmap") != 0)
{
- char buf[300];
- sprintf(buf, "%s not a bitmap resource specification.", resource);
- wxWarning(buf);
- return NULL;
+ wxLogWarning(_("%s not a bitmap resource specification."), resource);
+ return (wxBitmap *) NULL;
}
int thisDepth = wxDisplayDepth();
long thisNoColours = (long)pow(2.0, (double)thisDepth);
- wxItemResource *optResource = NULL;
+ wxItemResource *optResource = (wxItemResource *) NULL;
// Try to find optimum bitmap for this platform/colour depth
wxNode *node = item->GetChildren().First();
break;
}
#endif
-#ifdef __X__
+#ifdef __WXGTK__
case RESOURCE_PLATFORM_X:
{
if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
}
// If no matching resource, fail.
if (!optResource)
- return NULL;
+ return (wxBitmap *) NULL;
char *name = optResource->GetName();
int bitmapType = (int)optResource->GetValue1();
- wxBitmap *bitmap = NULL;
+ wxBitmap *bitmap = (wxBitmap *) NULL;
switch (bitmapType)
{
case wxBITMAP_TYPE_XBM_DATA:
{
-#ifdef __X__
+#ifdef __WXGTK__
wxItemResource *item = table->FindResource(name);
if (!item)
{
- char buf[400];
- sprintf(buf, "Failed to find XBM resource %s.\nForgot to use wxResourceLoadBitmapData?", name);
- wxWarning(buf);
- return NULL;
+ wxLogWarning(_("Failed to find XBM resource %s.\n"
+ "Forgot to use wxResourceLoadBitmapData?"), name);
+ return (wxBitmap *) NULL;
}
bitmap = new wxBitmap((char *)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
#else
- wxWarning("No XBM facility available!");
+ wxLogWarning(_("No XBM facility available!"));
#endif
break;
}
case wxBITMAP_TYPE_XPM_DATA:
{
-#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WXMSW__) && USE_XPM_IN_MSW)
+#if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)
wxItemResource *item = table->FindResource(name);
if (!item)
{
- char buf[400];
- sprintf(buf, "Failed to find XPM resource %s.\nForgot to use wxResourceLoadBitmapData?", name);
- wxWarning(buf);
- return NULL;
+ wxLogWarning(_("Failed to find XPM resource %s.\n"
+ "Forgot to use wxResourceLoadBitmapData?"), name);
+ return (wxBitmap *) NULL;
}
bitmap = new wxBitmap(item->GetValue1());
#else
- wxWarning("No XPM facility available!");
+ wxLogWarning(_("No XPM facility available!"));
#endif
break;
}
}
}
if (!bitmap)
- return NULL;
+ return (wxBitmap *) NULL;
if (bitmap->Ok())
{
else
{
delete bitmap;
- return NULL;
+ return (wxBitmap *) NULL;
}
}
else
{
- char buf[300];
- sprintf(buf, "Bitmap resource specification %s not found.", resource);
- wxWarning(buf);
- return NULL;
+ wxLogWarning(_("Bitmap resource specification %s not found."), resource);
+ return (wxBitmap *) NULL;
}
}
{
if (!item->GetType() || strcmp(item->GetType(), "wxIcon") != 0)
{
- char buf[300];
- sprintf(buf, "%s not an icon resource specification.", resource);
- wxWarning(buf);
- return NULL;
+ wxLogWarning(_("%s not an icon resource specification."), resource);
+ return (wxIcon *) NULL;
}
int thisDepth = wxDisplayDepth();
long thisNoColours = (long)pow(2.0, (double)thisDepth);
- wxItemResource *optResource = NULL;
+ wxItemResource *optResource = (wxItemResource *) NULL;
// Try to find optimum icon for this platform/colour depth
wxNode *node = item->GetChildren().First();
break;
}
#endif
-#ifdef __X__
+#ifdef __WXGTK__
case RESOURCE_PLATFORM_X:
{
if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
}
// If no matching resource, fail.
if (!optResource)
- return NULL;
+ return (wxIcon *) NULL;
char *name = optResource->GetName();
int bitmapType = (int)optResource->GetValue1();
- wxIcon *icon = NULL;
+ wxIcon *icon = (wxIcon *) NULL;
switch (bitmapType)
{
case wxBITMAP_TYPE_XBM_DATA:
{
-#ifdef __X__
+#ifdef __WXGTK__
wxItemResource *item = table->FindResource(name);
if (!item)
{
- char buf[400];
- sprintf(buf, "Failed to find XBM resource %s.\nForgot to use wxResourceLoadIconData?", name);
- wxWarning(buf);
- return NULL;
+ wxLogWarning(_("Failed to find XBM resource %s.\n"
+ "Forgot to use wxResourceLoadIconData?"), name);
+ return (wxIcon *) NULL;
}
- icon = new wxIcon((char *)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
+ icon = new wxIcon((char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
#else
- wxWarning("No XBM facility available!");
+ wxLogWarning(_("No XBM facility available!"));
#endif
break;
}
{
// *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
/*
-#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WXMSW__) && USE_XPM_IN_MSW)
+#if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)
wxItemResource *item = table->FindResource(name);
if (!item)
{
char buf[400];
- sprintf(buf, "Failed to find XPM resource %s.\nForgot to use wxResourceLoadIconData?", name);
- wxWarning(buf);
+ sprintf(buf, _("Failed to find XPM resource %s.\nForgot to use wxResourceLoadIconData?"), name);
+ wxLogWarning(buf);
return NULL;
}
icon = new wxIcon((char **)item->GetValue1());
#else
- wxWarning("No XPM facility available!");
+ wxLogWarning(_("No XPM facility available!"));
#endif
*/
- wxWarning("No XPM icon facility available!");
+ wxLogWarning(_("No XPM icon facility available!"));
break;
}
default:
{
+#ifdef __WXGTK__
+ wxLogWarning(_("Icon resource specification %s not found."), resource);
+#else
icon = new wxIcon(name, bitmapType);
+#endif
break;
}
}
if (!icon)
- return NULL;
+ return (wxIcon *) NULL;
if (icon->Ok())
{
else
{
delete icon;
- return NULL;
+ return (wxIcon *) NULL;
}
}
else
{
- char buf[300];
- sprintf(buf, "Icon resource specification %s not found.", resource);
- wxWarning(buf);
- return NULL;
+ wxLogWarning(_("Icon resource specification %s not found."), resource);
+ return (wxIcon *) NULL;
}
}
}
return menuBar;
}
- return NULL;
+ return (wxMenuBar *) NULL;
}
wxMenu *wxResourceCreateMenu(char *resource, wxResourceTable *table)
if (menuResource && menuResource->GetType() && strcmp(menuResource->GetType(), "wxMenu") == 0)
// if (menuResource && (menuResource->GetType() == wxTYPE_MENU))
return wxResourceCreateMenu(menuResource);
- return NULL;
+ return (wxMenu *) NULL;
}
// Global equivalents (so don't have to refer to default table explicitly)
}
else
{
- char buf[300];
- sprintf(buf, "#define %s must be an integer.", name);
- wxWarning(buf);
+ wxLogWarning(_("#define %s must be an integer."), name);
delete[] name;
delete[] value;
return FALSE;
if (!wxResourceParseIncludeFile(actualName, table))
{
char buf[400];
- sprintf(buf, "Could not find resource include file %s.", actualName);
- wxWarning(buf);
+ sprintf(buf, _("Could not find resource include file %s."), actualName);
+ wxLogWarning(buf);
}
delete[] name;
return TRUE;
else if (strcmp(wxResourceBuffer, "static") != 0)
{
char buf[300];
- strcpy(buf, "Found ");
+ strcpy(buf, _("Found "));
strncat(buf, wxResourceBuffer, 30);
- strcat(buf, ", expected static, #include or #define\nwhilst parsing resource.");
- wxWarning(buf);
+ strcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+ wxLogWarning(buf);
return FALSE;
}
// char
if (!wxGetResourceTokenString(s))
{
- wxWarning("Unexpected end of file whilst parsing resource.");
+ wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE;
return FALSE;
}
if (strcmp(wxResourceBuffer, "char") != 0)
{
- wxWarning("Expected 'char' whilst parsing resource.");
+ wxLogWarning(_("Expected 'char' whilst parsing resource."));
return FALSE;
}
// *name
if (!wxGetResourceTokenString(s))
{
- wxWarning("Unexpected end of file whilst parsing resource.");
+ wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE;
return FALSE;
}
if (wxResourceBuffer[0] != '*')
{
- wxWarning("Expected '*' whilst parsing resource.");
+ wxLogWarning(_("Expected '*' whilst parsing resource."));
return FALSE;
}
char nameBuf[100];
// =
if (!wxGetResourceTokenString(s))
{
- wxWarning("Unexpected end of file whilst parsing resource.");
+ wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE;
return FALSE;
}
if (strcmp(wxResourceBuffer, "=") != 0)
{
- wxWarning("Expected '=' whilst parsing resource.");
+ wxLogWarning(_("Expected '=' whilst parsing resource."));
return FALSE;
}
// String
if (!wxGetResourceTokenString(s))
{
- wxWarning("Unexpected end of file whilst parsing resource.");
+ wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE;
return FALSE;
}
{
if (!db.ReadPrologFromString(wxResourceBuffer))
{
- char buf[300];
- sprintf(buf, "%s: ill-formed resource file syntax.", nameBuf);
- wxWarning(buf);
+ wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
return FALSE;
}
}
if (IsKindOf(CLASSINFO(wxDialog)))
{
wxDialog *dialogBox = (wxDialog *)this;
- long modalStyle = isModal ? wxDIALOG_MODAL : 0;
+ long modalStyle = isModal ? wxDIALOG_MODAL : 0;
if (!dialogBox->Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), theWindowStyle|modalStyle, name))
return FALSE;
dialogBox->SetClientSize(width, height);
if (resource->GetBackgroundColour())
SetBackgroundColour(*resource->GetBackgroundColour());
- // TODO
+ // TODO
if (resource->GetLabelColour())
SetForegroundColour(*resource->GetLabelColour());
else if (resource->GetButtonColour())
return table->CreateItem((wxWindow *)this, (wxItemResource *)resource);
}
-#endif // USE_WX_RESOURCES
+#endif // wxUSE_WX_RESOURCES
projects / wxWidgets.git / blobdiff