X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aad5220b823778a271e25ca74e4127034161e280..7aa88ac4af764fa92c781056bc23103cadea21a4:/src/common/resource.cpp diff --git a/src/common/resource.cpp b/src/common/resource.cpp index cda27959fd..49c769a130 100644 --- a/src/common/resource.cpp +++ b/src/common/resource.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -20,6 +20,12 @@ #pragma hdrstop #endif +#if wxUSE_WX_RESOURCES + +#ifdef _MSC_VER + #pragma warning(disable:4706) // assignment within conditional expression +#endif // VC++ + #ifndef WX_PRECOMP #include "wx/defs.h" #include "wx/setup.h" @@ -31,30 +37,33 @@ #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/settings.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" #include #include @@ -65,41 +74,45 @@ #include "wx/string.h" #include "wx/wxexpr.h" +#include "wx/settings.h" + // Forward (private) declarations -bool wxResourceInterpretResources(wxResourceTable& table, PrologDatabase& db); -wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *expr, bool isPanel = FALSE); -wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *expr); -wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, PrologExpr *expr); -wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, PrologExpr *expr); -wxItemResource *wxResourceInterpretString(wxResourceTable& table, PrologExpr *expr); -wxItemResource *wxResourceInterpretBitmap(wxResourceTable& table, PrologExpr *expr); -wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, PrologExpr *expr); +bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db); +wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel = FALSE); +wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr); +wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr); +wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr); +wxItemResource *wxResourceInterpretString(wxResourceTable& table, wxExpr *expr); +wxItemResource *wxResourceInterpretBitmap(wxResourceTable& table, wxExpr *expr); +wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, wxExpr *expr); // Interpret list expression -wxFont *wxResourceInterpretFontSpec(PrologExpr *expr); +wxFont wxResourceInterpretFontSpec(wxExpr *expr); -bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResourceTable *table = NULL); -bool wxResourceParseIncludeFile(char *f, wxResourceTable *table = NULL); +bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table = (wxResourceTable *) NULL); +bool wxResourceParseIncludeFile(const wxString& 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 wxInitializeResourceSystem(void) +void wxInitializeResourceSystem() { wxDefaultResourceTable = new wxResourceTable; } -void wxCleanUpResourceSystem(void) +void wxCleanUpResourceSystem() { 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 @@ -107,115 +120,40 @@ IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable) #endif -wxItemResource::wxItemResource(void) +wxItemResource::wxItemResource() { - itemType = NULL; - title = NULL; - name = 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; + m_itemType = ""; + m_title = ""; + m_name = ""; + m_windowStyle = 0; + m_x = m_y = m_width = m_height = 0; + m_value1 = m_value2 = m_value3 = m_value5 = 0; + m_value4 = ""; m_windowId = 0; + m_exStyle = 0; } -wxItemResource::~wxItemResource(void) +wxItemResource::~wxItemResource() { - if (itemType) delete[] itemType; - if (title) delete[] title; - if (name) delete[] name; - if (value4) delete[] value4; - if (stringValues) - delete stringValues; - if (bitmap) - delete bitmap; - if (backgroundColour) - delete backgroundColour; - if (labelColour) - delete labelColour; - if (buttonColour) - delete buttonColour; - wxNode *node = children.First(); + wxNode *node = m_children.First(); while (node) { wxItemResource *item = (wxItemResource *)node->Data(); delete item; delete node; - node = children.First(); + node = m_children.First(); } } -void wxItemResource::SetTitle(char *t) -{ - if (t == title) - return; - - if (title) delete[] title; - if (t) - title = copystring(t); - else - title = NULL; -} - -void wxItemResource::SetType(char *t) -{ - if (itemType == t) - return; - - if (itemType) delete[] itemType; - if (t) - itemType = copystring(t); - else - itemType = NULL; -} - -void wxItemResource::SetName(char *n) -{ - if (n == name) - return; - - if (name) delete[] name; - if (n) - name = copystring(n); - else - name = NULL; -} - -void wxItemResource::SetStringValues(wxStringList *svalues) -{ - if (stringValues) - delete stringValues; - if (svalues) - stringValues = svalues; - else - stringValues = NULL; -} - -void wxItemResource::SetValue4(char *v) -{ - if (value4 == v) - return; - - if (value4) delete[] value4; - if (v) - value4 = copystring(v); - else - value4 = NULL; -} - /* * Resource table */ -wxResourceTable::wxResourceTable(void):wxHashTable(wxKEY_STRING), identifiers(wxKEY_STRING) +wxResourceTable::wxResourceTable():wxHashTable(wxKEY_STRING), identifiers(wxKEY_STRING) { } -wxResourceTable::~wxResourceTable(void) +wxResourceTable::~wxResourceTable() { ClearTable(); } @@ -228,10 +166,10 @@ wxItemResource *wxResourceTable::FindResource(const wxString& name) const void wxResourceTable::AddResource(wxItemResource *item) { - char *name = item->GetName(); - if (!name) + wxString name = item->GetName(); + if (name == "") name = item->GetTitle(); - if (!name) + if (name == "") name = "no name"; // Delete existing resource, if any. @@ -248,7 +186,7 @@ bool wxResourceTable::DeleteResource(const wxString& name) // 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(); @@ -266,11 +204,11 @@ bool wxResourceTable::DeleteResource(const wxString& name) return FALSE; } -bool wxResourceTable::ParseResourceFile(char *filename) +bool wxResourceTable::ParseResourceFile(const wxString& filename) { - PrologDatabase db; + wxExprDatabase db; - FILE *fd = fopen(filename, "r"); + FILE *fd = fopen((const char*) filename, "r"); if (!fd) return FALSE; bool eof = FALSE; @@ -282,19 +220,19 @@ bool wxResourceTable::ParseResourceFile(char *filename) return wxResourceInterpretResources(*this, db); } -bool wxResourceTable::ParseResourceData(char *data) +bool wxResourceTable::ParseResourceData(const wxString& data) { - PrologDatabase db; - if (!db.ReadPrologFromString(data)) + wxExprDatabase db; + if (!db.ReadFromString(data)) { - wxWarning("Ill-formed resource file syntax."); + wxLogWarning(_("Ill-formed resource file syntax.")); return FALSE; } return wxResourceInterpretResources(*this, db); } -bool wxResourceTable::RegisterResourceBitmapData(char *name, char bits[], int width, int height) +bool wxResourceTable::RegisterResourceBitmapData(const wxString& name, char bits[], int width, int height) { // Register pre-loaded bitmap data wxItemResource *item = new wxItemResource; @@ -308,7 +246,7 @@ bool wxResourceTable::RegisterResourceBitmapData(char *name, char bits[], int wi return TRUE; } -bool wxResourceTable::RegisterResourceBitmapData(char *name, char **data) +bool wxResourceTable::RegisterResourceBitmapData(const wxString& name, char **data) { // Register pre-loaded bitmap data wxItemResource *item = new wxItemResource; @@ -320,12 +258,12 @@ bool wxResourceTable::RegisterResourceBitmapData(char *name, char **data) return TRUE; } -bool wxResourceTable::SaveResource(char *WXUNUSED(filename)) +bool wxResourceTable::SaveResource(const wxString& WXUNUSED(filename)) { return FALSE; } -void wxResourceTable::ClearTable(void) +void wxResourceTable::ClearTable() { BeginFind(); wxNode *node = Next(); @@ -339,108 +277,107 @@ void wxResourceTable::ClearTable(void) } } -wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childResource) const +wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* childResource, const wxItemResource* parentResource) const { int id = childResource->GetId(); if ( id == 0 ) - id = -1; + id = -1; - wxControl *control = NULL; + bool dlgUnits = ((parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0); + + wxControl *control = (wxControl *) NULL; wxString itemType(childResource->GetType()); + + wxPoint pos; + wxSize size; + if (dlgUnits) + { + pos = parent->ConvertDialogToPixels(wxPoint(childResource->GetX(), childResource->GetY())); + size = parent->ConvertDialogToPixels(wxSize(childResource->GetWidth(), childResource->GetHeight())); + } + else + { + pos = wxPoint(childResource->GetX(), childResource->GetY()); + size = wxSize(childResource->GetWidth(), childResource->GetHeight()); + } + if (itemType == wxString("wxButton") || itemType == wxString("wxBitmapButton")) { - if (childResource->GetValue4()) + if (childResource->GetValue4() != "") { // Bitmap button - wxBitmap *bitmap = childResource->GetBitmap(); - if (!bitmap) + wxBitmap bitmap = childResource->GetBitmap(); + if (!bitmap.Ok()) { bitmap = wxResourceCreateBitmap(childResource->GetValue4(), (wxResourceTable *)this); - childResource->SetBitmap(bitmap); + ((wxItemResource*) childResource)->SetBitmap(bitmap); } - if (bitmap) - control = new wxBitmapButton(parent, id, *bitmap, - wxPoint(childResource->GetX(), childResource->GetY()), - wxSize(childResource->GetWidth(), childResource->GetHeight()), - childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); + if (bitmap.Ok()) + control = new wxBitmapButton(parent, id, bitmap, pos, size, + 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()), + control = new wxButton(parent, id, childResource->GetTitle(), pos, size, childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); } else if (itemType == wxString("wxMessage") || itemType == wxString("wxStaticText") || - itemType == wxString("wxStaticBitmap")) + itemType == wxString("wxStaticBitmap")) { - if (childResource->GetValue4()) + if (childResource->GetValue4() != "") { // Bitmap message - wxBitmap *bitmap = childResource->GetBitmap(); - if (!bitmap) + wxBitmap bitmap = childResource->GetBitmap(); + if (!bitmap.Ok()) { bitmap = wxResourceCreateBitmap(childResource->GetValue4(), (wxResourceTable *)this); - childResource->SetBitmap(bitmap); + ((wxItemResource*) childResource)->SetBitmap(bitmap); } -#if USE_BITMAP_MESSAGE - if (bitmap) - control = new wxStaticBitmap(parent, id, *bitmap, - wxPoint(childResource->GetX(), childResource->GetY()), - wxSize(childResource->GetWidth(), childResource->GetHeight()), +#if wxUSE_BITMAP_MESSAGE + if (bitmap.Ok()) + control = new wxStaticBitmap(parent, id, bitmap, pos, size, childResource->GetStyle(), childResource->GetName()); #endif } else { - control = new wxStaticText(parent, id, childResource->GetTitle(), - wxPoint(childResource->GetX(), childResource->GetY()), - wxSize(childResource->GetWidth(), childResource->GetHeight()), + control = new wxStaticText(parent, id, childResource->GetTitle(), pos, size, childResource->GetStyle(), childResource->GetName()); } } else if (itemType == wxString("wxText") || itemType == wxString("wxTextCtrl") || itemType == wxString("wxMultiText")) { - control = new wxTextCtrl(parent, id, childResource->GetValue4(), - wxPoint(childResource->GetX(), childResource->GetY()), - wxSize(childResource->GetWidth(), childResource->GetHeight()), + control = new wxTextCtrl(parent, id, childResource->GetValue4(), pos, size, 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()), + control = new wxCheckBox(parent, id, childResource->GetTitle(), pos, size, 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()), + control = new wxGauge(parent, id, (int)childResource->GetValue2(), pos, size, 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()), + pos, size, childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); } #endif -#if USE_SCROLLBAR +#if wxUSE_SCROLLBAR else if (itemType == wxString("wxScrollBar")) { - control = new wxScrollBar(parent, id, - wxPoint(childResource->GetX(), childResource->GetY()), - wxSize(childResource->GetWidth(), childResource->GetHeight()), + control = new wxScrollBar(parent, id, pos, size, childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); ((wxScrollBar *)control)->SetValue((int)childResource->GetValue1()); ((wxScrollBar *)control)->SetPageSize((int)childResource->GetValue2()); @@ -451,28 +388,24 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe else if (itemType == wxString("wxSlider")) { control = new wxSlider(parent, id, (int)childResource->GetValue1(), - (int)childResource->GetValue2(), (int)childResource->GetValue3(), - wxPoint(childResource->GetX(), childResource->GetY()), - wxSize(childResource->GetWidth(), childResource->GetHeight()), + (int)childResource->GetValue2(), (int)childResource->GetValue3(), pos, size, childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); } else if (itemType == wxString("wxGroupBox") || itemType == wxString("wxStaticBox")) { - control = new wxStaticBox(parent, id, childResource->GetTitle(), - wxPoint(childResource->GetX(), childResource->GetY()), - wxSize(childResource->GetWidth(), childResource->GetHeight()), + control = new wxStaticBox(parent, id, childResource->GetTitle(), pos, size, childResource->GetStyle(), childResource->GetName()); } else if (itemType == wxString("wxListBox")) { - wxStringList *stringList = childResource->GetStringValues(); - wxString *strings = NULL; + wxStringList& stringList = childResource->GetStringValues(); + wxString *strings = (wxString *) NULL; int noStrings = 0; - if (stringList && (stringList->Number() > 0)) + if (stringList.Number() > 0) { - noStrings = stringList->Number(); + noStrings = stringList.Number(); strings = new wxString[noStrings]; - wxNode *node = stringList->First(); + wxNode *node = stringList.First(); int i = 0; while (node) { @@ -481,9 +414,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe node = node->Next(); } } - control = new wxListBox(parent, id, - wxPoint(childResource->GetX(), childResource->GetY()), - wxSize(childResource->GetWidth(), childResource->GetHeight()), + control = new wxListBox(parent, id, pos, size, noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); if (strings) @@ -491,14 +422,14 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe } else if (itemType == wxString("wxChoice")) { - wxStringList *stringList = childResource->GetStringValues(); - wxString *strings = NULL; + wxStringList& stringList = childResource->GetStringValues(); + wxString *strings = (wxString *) NULL; int noStrings = 0; - if (stringList && (stringList->Number() > 0)) + if (stringList.Number() > 0) { - noStrings = stringList->Number(); + noStrings = stringList.Number(); strings = new wxString[noStrings]; - wxNode *node = stringList->First(); + wxNode *node = stringList.First(); int i = 0; while (node) { @@ -507,25 +438,23 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe node = node->Next(); } } - control = new wxChoice(parent, id, - wxPoint(childResource->GetX(), childResource->GetY()), - wxSize(childResource->GetWidth(), childResource->GetHeight()), + control = new wxChoice(parent, id, pos, size, 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; + wxStringList& stringList = childResource->GetStringValues(); + wxString *strings = (wxString *) NULL; int noStrings = 0; - if (stringList && (stringList->Number() > 0)) + if (stringList.Number() > 0) { - noStrings = stringList->Number(); + noStrings = stringList.Number(); strings = new wxString[noStrings]; - wxNode *node = stringList->First(); + wxNode *node = stringList.First(); int i = 0; while (node) { @@ -534,9 +463,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe node = node->Next(); } } - control = new wxComboBox(parent, id, childResource->GetValue4(), - wxPoint(childResource->GetX(), childResource->GetY()), - wxSize(childResource->GetWidth(), childResource->GetHeight()), + control = new wxComboBox(parent, id, childResource->GetValue4(), pos, size, noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); if (strings) @@ -545,14 +472,14 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe #endif else if (itemType == wxString("wxRadioBox")) { - wxStringList *stringList = childResource->GetStringValues(); - wxString *strings = NULL; + wxStringList& stringList = childResource->GetStringValues(); + wxString *strings = (wxString *) NULL; int noStrings = 0; - if (stringList && (stringList->Number() > 0)) + if (stringList.Number() > 0) { - noStrings = stringList->Number(); + noStrings = stringList.Number(); strings = new wxString[noStrings]; - wxNode *node = stringList->First(); + wxNode *node = stringList.First(); int i = 0; while (node) { @@ -561,18 +488,23 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe node = node->Next(); } } - control = new wxRadioBox(parent, (const wxWindowID) id, wxString(childResource->GetTitle()), - wxPoint(childResource->GetX(), childResource->GetY()), - wxSize(childResource->GetWidth(), childResource->GetHeight()), + control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()), pos, size, noStrings, strings, (int)childResource->GetValue1(), childResource->GetStyle(), wxDefaultValidator, - childResource->GetName()); + childResource->GetName()); if (strings) delete[] strings; } - if (control && childResource->GetFont()) - control->SetFont(*childResource->GetFont()); + if ((parentResource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0) + { + // Don't set font; will be inherited from parent. + } + else + { + if (control && childResource->GetFont().Ok()) + control->SetFont(childResource->GetFont()); + } return control; } @@ -580,15 +512,15 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe * Interpret database as a series of resources */ -bool wxResourceInterpretResources(wxResourceTable& table, PrologDatabase& db) +bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db) { wxNode *node = db.First(); while (node) { - PrologExpr *clause = (PrologExpr *)node->Data(); - wxString functor(clause->Functor()); + wxExpr *clause = (wxExpr *)node->Data(); + wxString functor(clause->Functor()); - wxItemResource *item = NULL; + wxItemResource *item = (wxItemResource *) NULL; if (functor == "dialog") item = wxResourceInterpretDialog(table, clause); else if (functor == "panel") @@ -607,7 +539,7 @@ bool wxResourceInterpretResources(wxResourceTable& table, PrologDatabase& db) if (item) { // Remove any existing resource of same name - if (item->GetName()) + if (item->GetName() != "") table.DeleteResource(item->GetName()); table.AddResource(item); } @@ -625,28 +557,28 @@ static int g_ValidControlClassesCount = sizeof(g_ValidControlClasses) / sizeof(c 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) +wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel) { wxItemResource *dialogItem = new wxItemResource; if (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; + wxString style = ""; + wxString title = ""; + wxString name = ""; + wxString backColourHex = ""; + wxString labelColourHex = ""; + wxString buttonColourHex = ""; long windowStyle = wxDEFAULT_DIALOG_STYLE; if (isPanel) @@ -654,77 +586,79 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *ex int x = 0; int y = 0; int width = -1; int height = -1; int isModal = 0; - PrologExpr *labelFontExpr = NULL; - PrologExpr *buttonFontExpr = NULL; - PrologExpr *fontExpr = NULL; - expr->AssignAttributeValue("style", &style); - expr->AssignAttributeValue("name", &name); - expr->AssignAttributeValue("title", &title); - expr->AssignAttributeValue("x", &x); - expr->AssignAttributeValue("y", &y); - expr->AssignAttributeValue("width", &width); - expr->AssignAttributeValue("height", &height); - expr->AssignAttributeValue("modal", &isModal); - expr->AssignAttributeValue("label_font", &labelFontExpr); - expr->AssignAttributeValue("button_font", &buttonFontExpr); - expr->AssignAttributeValue("font", &fontExpr); - expr->AssignAttributeValue("background_colour", &backColourHex); - expr->AssignAttributeValue("label_colour", &labelColourHex); - expr->AssignAttributeValue("button_colour", &buttonColourHex); - - if (style) + wxExpr *labelFontExpr = (wxExpr *) NULL; + wxExpr *buttonFontExpr = (wxExpr *) NULL; + wxExpr *fontExpr = (wxExpr *) NULL; + expr->GetAttributeValue("style", style); + expr->GetAttributeValue("name", name); + expr->GetAttributeValue("title", title); + expr->GetAttributeValue("x", x); + expr->GetAttributeValue("y", y); + expr->GetAttributeValue("width", width); + expr->GetAttributeValue("height", height); + expr->GetAttributeValue("modal", isModal); + expr->GetAttributeValue("label_font", &labelFontExpr); + expr->GetAttributeValue("button_font", &buttonFontExpr); + expr->GetAttributeValue("font", &fontExpr); + expr->GetAttributeValue("background_colour", backColourHex); + expr->GetAttributeValue("label_colour", labelColourHex); + expr->GetAttributeValue("button_colour", buttonColourHex); + + int useDialogUnits = 0; + expr->GetAttributeValue("use_dialog_units", useDialogUnits); + if (useDialogUnits != 0) + dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_DIALOG_UNITS); + + int useDefaults = 0; + expr->GetAttributeValue("use_system_defaults", useDefaults); + if (useDefaults != 0) + dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_USE_DEFAULTS); + + long id = 0; + expr->GetAttributeValue("id", id); + dialogItem->SetId(id); + + if (style != "") { windowStyle = wxParseWindowStyle(style); } dialogItem->SetStyle(windowStyle); dialogItem->SetValue1(isModal); - if (name) - dialogItem->SetName(name); - if (title) - dialogItem->SetTitle(title); + dialogItem->SetName(name); + dialogItem->SetTitle(title); dialogItem->SetSize(x, y, width, height); - if (backColourHex) + if (backColourHex != "") { int r = 0; int g = 0; int b = 0; - r = wxHexToDec(backColourHex); - g = wxHexToDec(backColourHex+2); - b = wxHexToDec(backColourHex+4); - dialogItem->SetBackgroundColour(new wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b)); - delete[] backColourHex; + r = wxHexToDec(backColourHex.Mid(0, 2)); + g = wxHexToDec(backColourHex.Mid(2, 2)); + b = wxHexToDec(backColourHex.Mid(4, 2)); + dialogItem->SetBackgroundColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b)); } - if (labelColourHex) + if (labelColourHex != "") { int r = 0; int g = 0; int b = 0; - r = wxHexToDec(labelColourHex); - g = wxHexToDec(labelColourHex+2); - b = wxHexToDec(labelColourHex+4); - dialogItem->SetLabelColour(new wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b)); - delete[] labelColourHex; + r = wxHexToDec(labelColourHex.Mid(0, 2)); + g = wxHexToDec(labelColourHex.Mid(2, 2)); + b = wxHexToDec(labelColourHex.Mid(4, 2)); + dialogItem->SetLabelColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b)); } - if (buttonColourHex) + if (buttonColourHex != "") { int r = 0; int g = 0; int b = 0; - r = wxHexToDec(buttonColourHex); - g = wxHexToDec(buttonColourHex+2); - b = wxHexToDec(buttonColourHex+4); - dialogItem->SetButtonColour(new wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b)); - delete[] buttonColourHex; + r = wxHexToDec(buttonColourHex.Mid(0, 2)); + g = wxHexToDec(buttonColourHex.Mid(2, 2)); + b = wxHexToDec(buttonColourHex.Mid(4, 2)); + dialogItem->SetButtonColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b)); } - if (name) - delete[] name; - if (title) - delete[] title; - if (style) - delete[] style; - if (fontExpr) dialogItem->SetFont(wxResourceInterpretFontSpec(fontExpr)); else if (buttonFontExpr) @@ -733,7 +667,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *ex dialogItem->SetFont(wxResourceInterpretFontSpec(labelFontExpr)); // Now parse all controls - PrologExpr *controlExpr = expr->GetFirst(); + wxExpr *controlExpr = expr->GetFirst(); while (controlExpr) { if (controlExpr->Number() == 3) @@ -742,7 +676,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *ex if (controlKeyword != "" && controlKeyword == "control") { // The value part: always a list. - PrologExpr *listExpr = controlExpr->Nth(2); + wxExpr *listExpr = controlExpr->Nth(2); if (listExpr->Type() == PrologList) { wxItemResource *controlItem = wxResourceInterpretControl(table, listExpr); @@ -758,7 +692,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *ex return dialogItem; } -wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *expr) +wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr) { wxItemResource *controlItem = new wxItemResource; @@ -774,54 +708,55 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e int x = 0; int y = 0; int width = -1; int height = -1; int count = 0; - PrologExpr *expr1 = expr->Nth(0); + wxExpr *expr1 = expr->Nth(0); if ( expr1->Type() == PrologString || expr1->Type() == PrologWord ) { - if ( wxIsValidControlClass(expr1->StringValue()) ) - { - count = 1; - controlType = expr1->StringValue(); - } - else - { - id = wxResourceGetIdentifier(WXSTRINGCAST expr1->StringValue(), &table); + if ( wxIsValidControlClass(expr1->StringValue()) ) + { + count = 1; + controlType = expr1->StringValue(); + } + else + { + wxString str(expr1->StringValue()); + id = wxResourceGetIdentifier(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 ++; if (expr1) { style = expr1->StringValue(); - windowStyle = wxParseWindowStyle(WXSTRINGCAST style); + windowStyle = wxParseWindowStyle(style); } expr1 = expr->Nth(count); @@ -850,10 +785,10 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e height = (int)expr1->IntegerValue(); controlItem->SetStyle(windowStyle); - controlItem->SetName(WXSTRINGCAST name); - controlItem->SetTitle(WXSTRINGCAST title); + controlItem->SetName(name); + controlItem->SetTitle(title); controlItem->SetSize(x, y, width, height); - controlItem->SetType(WXSTRINGCAST controlType); + controlItem->SetType(controlType); controlItem->SetId(id); if (controlType == "wxButton") @@ -861,60 +796,63 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e // Check for bitmap resource name if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord))) { - controlItem->SetValue4(WXSTRINGCAST expr->Nth(count)->StringValue()); - count ++; - if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) - controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); + wxString str(expr->Nth(count)->StringValue()); + controlItem->SetValue4(str); + count ++; + if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) + controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); } } else if (controlType == "wxCheckBox") { // 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))) - { - controlItem->SetValue4(WXSTRINGCAST expr->Nth(count)->StringValue()); - count ++; + { + wxString str(expr->Nth(count)->StringValue()); + controlItem->SetValue4(str); + 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 bitmap resource name if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord))) { - controlItem->SetValue4(WXSTRINGCAST expr->Nth(count)->StringValue()); + wxString str(expr->Nth(count)->StringValue()); + controlItem->SetValue4(str); count ++; if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); @@ -929,249 +867,255 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e { // 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; + wxExpr *valueList = (wxExpr *) NULL; if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList)) { - wxStringList *stringList = new wxStringList; - PrologExpr *stringExpr = valueList->GetFirst(); + wxStringList stringList; + wxExpr *stringExpr = valueList->GetFirst(); while (stringExpr) { - stringList->Add(stringExpr->StringValue()); + stringList.Add(stringExpr->StringValue()); stringExpr = stringExpr->GetNext(); } controlItem->SetStringValues(stringList); - count ++; - + count ++; +// This is now obsolete: it's in the window style. // Check for wxSINGLE/wxMULTIPLE - PrologExpr *mult = NULL; + wxExpr *mult = (wxExpr *) NULL; +/* controlItem->SetValue1(wxLB_SINGLE); +*/ if ((mult = expr->Nth(count)) && ((mult->Type() == PrologString)||(mult->Type() == PrologWord))) { +/* wxString m(mult->StringValue()); - if (m == "wxMULTIPLE") + if (m == "wxLB_MULTIPLE") controlItem->SetValue1(wxLB_MULTIPLE); - else if (m == "wxEXTENDED") + else if (m == "wxLB_EXTENDED") controlItem->SetValue1(wxLB_EXTENDED); - count ++; - if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) - { - // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count))); - count ++; - if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) - controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); - } - } - } +*/ + // Ignore the value + count ++; + } + if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) + { + // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count))); + count ++; + if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) + controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); + } + } } else if (controlType == "wxChoice") { - PrologExpr *valueList = NULL; + wxExpr *valueList = (wxExpr *) NULL; // Check for default value list if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList)) { - wxStringList *stringList = new wxStringList; - PrologExpr *stringExpr = valueList->GetFirst(); + wxStringList stringList; + wxExpr *stringExpr = valueList->GetFirst(); while (stringExpr) { - stringList->Add(stringExpr->StringValue()); + stringList.Add(stringExpr->StringValue()); stringExpr = stringExpr->GetNext(); } 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); + wxExpr *textValue = expr->Nth(count); if (textValue && (textValue->Type() == PrologString || textValue->Type() == PrologWord)) - { - controlItem->SetValue4(WXSTRINGCAST textValue->StringValue()); + { + wxString str(textValue->StringValue()); + controlItem->SetValue4(str); - count ++; + count ++; - PrologExpr *valueList = NULL; + wxExpr *valueList = (wxExpr *) NULL; // Check for default value list if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList)) { - wxStringList *stringList = new wxStringList; - PrologExpr *stringExpr = valueList->GetFirst(); + wxStringList stringList; + wxExpr *stringExpr = valueList->GetFirst(); while (stringExpr) { - stringList->Add(stringExpr->StringValue()); + stringList.Add(stringExpr->StringValue()); stringExpr = stringExpr->GetNext(); } 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; + wxExpr *valueList = (wxExpr *) NULL; // Check for default value list if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList)) { - wxStringList *stringList = new wxStringList; - PrologExpr *stringExpr = valueList->GetFirst(); + wxStringList stringList; + wxExpr *stringExpr = valueList->GetFirst(); while (stringExpr) { - stringList->Add(stringExpr->StringValue()); + stringList.Add(stringExpr->StringValue()); 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; } // Forward declaration -wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, PrologExpr *expr); +wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, wxExpr *expr); /* * Interpet a menu item */ -wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, PrologExpr *expr) +wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, wxExpr *expr) { wxItemResource *item = new wxItemResource; - PrologExpr *labelExpr = expr->Nth(0); - PrologExpr *idExpr = expr->Nth(1); - PrologExpr *helpExpr = expr->Nth(2); - PrologExpr *checkableExpr = expr->Nth(3); + wxExpr *labelExpr = expr->Nth(0); + wxExpr *idExpr = expr->Nth(1); + wxExpr *helpExpr = expr->Nth(2); + wxExpr *checkableExpr = expr->Nth(3); // Further keywords/attributes to follow sometime... if (expr->Number() == 0) @@ -1186,7 +1130,8 @@ wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, PrologExpr * item->SetType("wxMenu"); // Well, menu item, but doesn't matter. if (labelExpr) { - item->SetTitle(WXSTRINGCAST labelExpr->StringValue()); + wxString str(labelExpr->StringValue()); + item->SetTitle(str); } if (idExpr) { @@ -1194,13 +1139,14 @@ wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, PrologExpr * // If a string or word, must look up in identifier table. if ((idExpr->Type() == PrologString) || (idExpr->Type() == PrologWord)) { - id = wxResourceGetIdentifier(WXSTRINGCAST idExpr->StringValue(), &table); + wxString str(idExpr->StringValue()); + id = wxResourceGetIdentifier(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) @@ -1209,13 +1155,14 @@ wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, PrologExpr * } if (helpExpr) { - item->SetValue4(WXSTRINGCAST helpExpr->StringValue()); + wxString str(helpExpr->StringValue()); + item->SetValue4(str); } if (checkableExpr) item->SetValue2(checkableExpr->IntegerValue()); // Find the first expression that's a list, for submenu - PrologExpr *subMenuExpr = expr->GetFirst(); + wxExpr *subMenuExpr = expr->GetFirst(); while (subMenuExpr && (subMenuExpr->Type() != PrologList)) subMenuExpr = subMenuExpr->GetNext(); @@ -1233,12 +1180,12 @@ wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, PrologExpr * * Interpret a nested list as a menu */ /* -wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, PrologExpr *expr) +wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, wxExpr *expr) { wxItemResource *menu = new wxItemResource; // menu->SetType(wxTYPE_MENU); menu->SetType("wxMenu"); - PrologExpr *element = expr->GetFirst(); + wxExpr *element = expr->GetFirst(); while (element) { wxItemResource *item = wxResourceInterpretMenuItem(table, element); @@ -1250,41 +1197,39 @@ wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, PrologExpr *exp } */ -wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, PrologExpr *expr) +wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr) { - PrologExpr *listExpr = NULL; - expr->AssignAttributeValue("menu", &listExpr); + wxExpr *listExpr = (wxExpr *) NULL; + expr->GetAttributeValue("menu", &listExpr); if (!listExpr) - return NULL; + return (wxItemResource *) NULL; wxItemResource *menuResource = wxResourceInterpretMenuItem(table, listExpr); if (!menuResource) - return NULL; - - char *name = NULL; - expr->AssignAttributeValue("name", &name); - if (name) + return (wxItemResource *) NULL; + + wxString name; + if (expr->GetAttributeValue("name", name)) { menuResource->SetName(name); - delete[] name; } return menuResource; } -wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, PrologExpr *expr) +wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr) { - PrologExpr *listExpr = NULL; - expr->AssignAttributeValue("menu", &listExpr); + wxExpr *listExpr = (wxExpr *) NULL; + expr->GetAttributeValue("menu", &listExpr); if (!listExpr) - return NULL; + return (wxItemResource *) NULL; wxItemResource *resource = new wxItemResource; resource->SetType("wxMenu"); // resource->SetType(wxTYPE_MENU); - PrologExpr *element = listExpr->GetFirst(); + wxExpr *element = listExpr->GetFirst(); while (element) { wxItemResource *menuResource = wxResourceInterpretMenuItem(table, listExpr); @@ -1292,36 +1237,32 @@ wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, PrologExpr *e element = element->GetNext(); } - char *name = NULL; - expr->AssignAttributeValue("name", &name); - if (name) + wxString name; + if (expr->GetAttributeValue("name", name)) { resource->SetName(name); - delete[] name; } return resource; } -wxItemResource *wxResourceInterpretString(wxResourceTable& WXUNUSED(table), PrologExpr *WXUNUSED(expr)) +wxItemResource *wxResourceInterpretString(wxResourceTable& WXUNUSED(table), wxExpr *WXUNUSED(expr)) { - return NULL; + return (wxItemResource *) NULL; } -wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), PrologExpr *expr) +wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), wxExpr *expr) { wxItemResource *bitmapItem = new wxItemResource; // bitmapItem->SetType(wxTYPE_BITMAP); bitmapItem->SetType("wxBitmap"); - char *name = NULL; - expr->AssignAttributeValue("name", &name); - if (name) + wxString name; + if (expr->GetAttributeValue("name", name)) { bitmapItem->SetName(name); - delete[] name; } // Now parse all bitmap specifications - PrologExpr *bitmapExpr = expr->GetFirst(); + wxExpr *bitmapExpr = expr->GetFirst(); while (bitmapExpr) { if (bitmapExpr->Number() == 3) @@ -1330,7 +1271,7 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), Prol if (bitmapKeyword == "bitmap" || bitmapKeyword == "icon") { // The value part: always a list. - PrologExpr *listExpr = bitmapExpr->Nth(2); + wxExpr *listExpr = bitmapExpr->Nth(2); if (listExpr->Type() == PrologList) { wxItemResource *bitmapSpec = new wxItemResource; @@ -1339,16 +1280,20 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), Prol // List is of form: [filename, bitmaptype, platform, colours, xresolution, yresolution] // where everything after 'filename' is optional. - PrologExpr *nameExpr = listExpr->Nth(0); - PrologExpr *typeExpr = listExpr->Nth(1); - PrologExpr *platformExpr = listExpr->Nth(2); - PrologExpr *coloursExpr = listExpr->Nth(3); - PrologExpr *xresExpr = listExpr->Nth(4); - PrologExpr *yresExpr = listExpr->Nth(5); + wxExpr *nameExpr = listExpr->Nth(0); + wxExpr *typeExpr = listExpr->Nth(1); + wxExpr *platformExpr = listExpr->Nth(2); + wxExpr *coloursExpr = listExpr->Nth(3); + wxExpr *xresExpr = listExpr->Nth(4); + wxExpr *yresExpr = listExpr->Nth(5); if (nameExpr && nameExpr->StringValue()) - bitmapSpec->SetName(WXSTRINGCAST nameExpr->StringValue()); + { + bitmapSpec->SetName(nameExpr->StringValue()); + } if (typeExpr && typeExpr->StringValue()) - bitmapSpec->SetValue1(wxParseWindowStyle(WXSTRINGCAST typeExpr->StringValue())); + { + bitmapSpec->SetValue1(wxParseWindowStyle(typeExpr->StringValue())); + } else bitmapSpec->SetValue1(0); @@ -1387,7 +1332,7 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), Prol return bitmapItem; } -wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, PrologExpr *expr) +wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, wxExpr *expr) { wxItemResource *item = wxResourceInterpretBitmap(table, expr); if (item) @@ -1397,14 +1342,14 @@ wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, PrologExpr *expr return item; } else - return NULL; + return (wxItemResource *) NULL; } // Interpret list expression as a font -wxFont *wxResourceInterpretFontSpec(PrologExpr *expr) +wxFont wxResourceInterpretFontSpec(wxExpr *expr) { if (expr->Type() != PrologList) - return NULL; + return wxNullFont; int point = 10; int family = wxSWISS; @@ -1413,29 +1358,37 @@ wxFont *wxResourceInterpretFontSpec(PrologExpr *expr) int underline = 0; wxString faceName(""); - PrologExpr *pointExpr = expr->Nth(0); - PrologExpr *familyExpr = expr->Nth(1); - PrologExpr *styleExpr = expr->Nth(2); - PrologExpr *weightExpr = expr->Nth(3); - PrologExpr *underlineExpr = expr->Nth(4); - PrologExpr *faceNameExpr = expr->Nth(5); + wxExpr *pointExpr = expr->Nth(0); + wxExpr *familyExpr = expr->Nth(1); + wxExpr *styleExpr = expr->Nth(2); + wxExpr *weightExpr = expr->Nth(3); + wxExpr *underlineExpr = expr->Nth(4); + wxExpr *faceNameExpr = expr->Nth(5); if (pointExpr) point = (int)pointExpr->IntegerValue(); + + wxString str; if (familyExpr) - family = (int)wxParseWindowStyle(WXSTRINGCAST familyExpr->StringValue()); + { + str = familyExpr->StringValue(); + family = (int)wxParseWindowStyle(str); + } if (styleExpr) - style = (int)wxParseWindowStyle(WXSTRINGCAST styleExpr->StringValue()); + { + str = styleExpr->StringValue(); + style = (int)wxParseWindowStyle(str); + } if (weightExpr) - weight = (int)wxParseWindowStyle(WXSTRINGCAST weightExpr->StringValue()); + { + str = weightExpr->StringValue(); + weight = (int)wxParseWindowStyle(str); + } if (underlineExpr) underline = (int)underlineExpr->IntegerValue(); if (faceNameExpr) faceName = faceNameExpr->StringValue(); - char *faceName1 = NULL; - if (faceName != "") - faceName1 = WXSTRINGCAST faceName; - wxFont *font = wxTheFontList->FindOrCreateFont(point, family, style, weight, (underline != 0), faceName1); + wxFont font(point, family, style, weight, (underline != 0), faceName); return font; } @@ -1443,7 +1396,7 @@ wxFont *wxResourceInterpretFontSpec(PrologExpr *expr) * (Re)allocate buffer for reading in from resource file */ -bool wxReallocateResourceBuffer(void) +bool wxReallocateResourceBuffer() { if (!wxResourceBuffer) { @@ -1576,7 +1529,7 @@ bool wxGetResourceToken(FILE *fd) with possible comments. */ -bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResourceTable *table) +bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table) { if (!table) table = wxDefaultResourceTable; @@ -1601,9 +1554,7 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour } 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; @@ -1625,9 +1576,7 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour 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; @@ -1635,38 +1584,38 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour 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]; @@ -1675,21 +1624,21 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour // = 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; } @@ -1697,9 +1646,7 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour { 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; } } @@ -1720,10 +1667,10 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour * "wxSYSTEM_MENU | wxBORDER" -> integer */ -char *wxResourceParseWord(char *s, int *i) +char* wxResourceParseWord(char*s, int *i) { if (!s) - return NULL; + return (char*) NULL; static char buf[150]; int len = strlen(s); @@ -1745,7 +1692,7 @@ char *wxResourceParseWord(char *s, int *i) } *i = ii; if (j == 0) - return NULL; + return (char*) NULL; else return buf; } @@ -1765,19 +1712,22 @@ static wxResourceBitListStruct wxResourceBitListTable[] = { "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 }, + { "wxLB_OWNERDRAW", wxLB_OWNERDRAW }, + { "wxLB_HSCROLL", wxLB_HSCROLL }, /* wxComboxBox */ { "wxCB_SIMPLE", wxCB_SIMPLE }, { "wxCB_DROPDOWN", wxCB_DROPDOWN }, + { "wxCB_READONLY", wxCB_READONLY }, { "wxCB_SORT", wxCB_SORT }, /* wxGauge */ { "wxGA_PROGRESSBAR", wxGA_PROGRESSBAR }, + { "wxGA_HORIZONTAL", wxGA_HORIZONTAL }, + { "wxGA_VERTICAL", wxGA_VERTICAL }, /* wxTextCtrl */ { "wxPASSWORD", wxPASSWORD}, @@ -1785,19 +1735,87 @@ static wxResourceBitListStruct wxResourceBitListTable[] = { "wxTE_PASSWORD", wxTE_PASSWORD}, { "wxTE_READONLY", wxTE_READONLY}, { "wxTE_PROCESS_ENTER", wxTE_PROCESS_ENTER}, + { "wxTE_MULTILINE", wxTE_MULTILINE}, - /* wxRadioButton */ + /* wxRadioBox/wxRadioButton */ { "wxRB_GROUP", wxRB_GROUP }, - - /* wxItem */ + { "wxRA_HORIZONTAL", wxRA_HORIZONTAL }, + { "wxRA_VERTICAL", wxRA_VERTICAL }, + + /* wxSlider */ + { "wxSL_HORIZONTAL", wxSL_HORIZONTAL }, + { "wxSL_VERTICAL", wxSL_VERTICAL }, + { "wxSL_AUTOTICKS", wxSL_AUTOTICKS }, + { "wxSL_LABELS", wxSL_LABELS }, + { "wxSL_LEFT", wxSL_LEFT }, + { "wxSL_TOP", wxSL_TOP }, + { "wxSL_RIGHT", wxSL_RIGHT }, + { "wxSL_BOTTOM", wxSL_BOTTOM }, + { "wxSL_BOTH", wxSL_BOTH }, + { "wxSL_SELRANGE", wxSL_SELRANGE }, + + /* wxScrollBar */ + { "wxSB_HORIZONTAL", wxSB_HORIZONTAL }, + { "wxSB_VERTICAL", wxSB_VERTICAL }, + + /* wxButton */ + { "wxBU_AUTODRAW", wxBU_AUTODRAW }, + { "wxBU_NOAUTODRAW", wxBU_NOAUTODRAW }, + + /* wxTreeCtrl */ + { "wxTR_HAS_BUTTONS", wxTR_HAS_BUTTONS }, + { "wxTR_EDIT_LABELS", wxTR_EDIT_LABELS }, + { "wxTR_LINES_AT_ROOT", wxTR_LINES_AT_ROOT }, + + /* wxListCtrl */ + { "wxLC_ICON", wxLC_ICON }, + { "wxLC_SMALL_ICON", wxLC_SMALL_ICON }, + { "wxLC_LIST", wxLC_LIST }, + { "wxLC_REPORT", wxLC_REPORT }, + { "wxLC_ALIGN_TOP", wxLC_ALIGN_TOP }, + { "wxLC_ALIGN_LEFT", wxLC_ALIGN_LEFT }, + { "wxLC_AUTOARRANGE", wxLC_AUTOARRANGE }, + { "wxLC_USER_TEXT", wxLC_USER_TEXT }, + { "wxLC_EDIT_LABELS", wxLC_EDIT_LABELS }, + { "wxLC_NO_HEADER", wxLC_NO_HEADER }, + { "wxLC_NO_SORT_HEADER", wxLC_NO_SORT_HEADER }, + { "wxLC_SINGLE_SEL", wxLC_SINGLE_SEL }, + { "wxLC_SORT_ASCENDING", wxLC_SORT_ASCENDING }, + { "wxLC_SORT_DESCENDING", wxLC_SORT_DESCENDING }, + + /* wxSpinButton */ + { "wxSP_VERTICAL", wxSP_VERTICAL}, + { "wxSP_HORIZONTAL", wxSP_HORIZONTAL}, + { "wxSP_ARROW_KEYS", wxSP_ARROW_KEYS}, + { "wxSP_WRAP", wxSP_WRAP}, + + /* wxSplitterWnd */ + { "wxSP_NOBORDER", wxSP_NOBORDER}, + { "wxSP_3D", wxSP_3D}, + { "wxSP_BORDER", wxSP_BORDER}, + + /* wxTabCtrl */ + { "wxTC_MULTILINE", wxTC_MULTILINE}, + { "wxTC_RIGHTJUSTIFY", wxTC_RIGHTJUSTIFY}, + { "wxTC_FIXEDWIDTH", wxTC_FIXEDWIDTH}, + { "wxTC_OWNERDRAW", wxTC_OWNERDRAW}, + + /* wxStatusBar95 */ + { "wxST_SIZEGRIP", wxST_SIZEGRIP}, + + /* wxControl */ { "wxFIXED_LENGTH", wxFIXED_LENGTH}, { "wxALIGN_LEFT", wxALIGN_LEFT}, { "wxALIGN_CENTER", wxALIGN_CENTER}, { "wxALIGN_CENTRE", wxALIGN_CENTRE}, { "wxALIGN_RIGHT", wxALIGN_RIGHT}, + { "wxCOLOURED", wxCOLOURED}, /* wxToolBar */ { "wxTB_3DBUTTONS", wxTB_3DBUTTONS}, + { "wxTB_HORIZONTAL", wxTB_HORIZONTAL}, + { "wxTB_VERTICAL", wxTB_VERTICAL}, + { "wxTB_FLAT", wxTB_FLAT}, /* Generic */ { "wxVSCROLL", wxVSCROLL }, @@ -1820,29 +1838,21 @@ static wxResourceBitListStruct wxResourceBitListTable[] = { "wxDEFAULT_DIALOG_STYLE", wxDEFAULT_DIALOG_STYLE}, { "wxBORDER", wxBORDER}, { "wxRETAINED", wxRETAINED}, - { "wxEDITABLE", wxEDITABLE}, - { "wxREADONLY", wxREADONLY}, { "wxNATIVE_IMPL", 0}, { "wxEXTENDED_IMPL", 0}, { "wxBACKINGSTORE", wxBACKINGSTORE}, // { "wxFLAT", wxFLAT}, // { "wxMOTIF_RESIZE", wxMOTIF_RESIZE}, - { "wxFIXED_LENGTH", wxFIXED_LENGTH}, + { "wxFIXED_LENGTH", 0}, + { "wxDOUBLE_BORDER", wxDOUBLE_BORDER}, + { "wxSUNKEN_BORDER", wxSUNKEN_BORDER}, + { "wxRAISED_BORDER", wxRAISED_BORDER}, + { "wxSIMPLE_BORDER", wxSIMPLE_BORDER}, + { "wxSTATIC_BORDER", wxSTATIC_BORDER}, + { "wxTRANSPARENT_WINDOW", wxTRANSPARENT_WINDOW}, + { "wxNO_BORDER", wxNO_BORDER}, + { "wxCLIP_CHILDREN", wxCLIP_CHILDREN}, -#if USE_ENHANCED_DIALOG - // Enhanced dialog - { "wxBOTTOM_COMMANDS", wxBOTTOM_COMMANDS}, - { "wxRIGHT_COMMANDS", wxRIGHT_COMMANDS}, - { "wxSTATUS_FOOTER", wxSTATUS_FOOTER}, - { "wxNO_STATUS_FOOTER", wxNO_STATUS_FOOTER}, - { "wxNO_CANCEL_BUTTON", wxNO_CANCEL_BUTTON}, - { "wxCANCEL_BUTTON_FIRST", wxCANCEL_BUTTON_FIRST}, - { "wxCANCEL_BUTTON_SECOND", wxCANCEL_BUTTON_SECOND}, - { "wxCANCEL_BUTTON_LAST", wxCANCEL_BUTTON_LAST}, - { "wxENH_DEFAULT", wxENH_DEFAULT}, -#endif - - { "wxCOLOURED", wxCOLOURED}, { "wxTINY_CAPTION_HORIZ", wxTINY_CAPTION_HORIZ}, { "wxTINY_CAPTION_VERT", wxTINY_CAPTION_VERT}, @@ -1945,12 +1955,12 @@ static wxResourceBitListStruct wxResourceBitListTable[] = static int wxResourceBitListCount = (sizeof(wxResourceBitListTable)/sizeof(wxResourceBitListStruct)); -long wxParseWindowStyle(char *bitListString) +long wxParseWindowStyle(const wxString& bitListString) { int i = 0; char *word; long bitList = 0; - while ((word = wxResourceParseWord(bitListString, &i))) + while ((word = wxResourceParseWord((char*) (const char*) bitListString, &i))) { bool found = FALSE; int j; @@ -1963,9 +1973,7 @@ long wxParseWindowStyle(char *bitListString) } 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; } } @@ -1977,7 +1985,7 @@ long wxParseWindowStyle(char *bitListString) * depth and appropriate type. */ -wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table) +wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table) { if (!table) table = wxDefaultResourceTable; @@ -1987,15 +1995,13 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table) { 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."), (const char*) resource); + return wxNullBitmap; } 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(); @@ -2027,7 +2033,7 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table) } break; } -#ifdef __WINDOWS__ +#ifdef __WXMSW__ case RESOURCE_PLATFORM_WINDOWS: { if (!optResource && ((noColours == 0) || (noColours <= thisNoColours))) @@ -2041,7 +2047,7 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table) break; } #endif -#ifdef __X__ +#ifdef __WXGTK__ case RESOURCE_PLATFORM_X: { if (!optResource && ((noColours == 0) || (noColours <= thisNoColours))) @@ -2076,72 +2082,56 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table) } // If no matching resource, fail. if (!optResource) - return NULL; + return wxNullBitmap; - char *name = optResource->GetName(); + wxString name = optResource->GetName(); int bitmapType = (int)optResource->GetValue1(); - wxBitmap *bitmap = 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?"), (const char*) name); + return (wxBitmap *) NULL; } - bitmap = new wxBitmap((char *)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()); + return wxBitmap(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(__WINDOWS__) && 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?"), (const char*) name); + return (wxBitmap *) NULL; } - bitmap = new wxBitmap((char **)item->GetValue1()); + return wxBitmap(item->GetValue1()); #else - wxWarning("No XPM facility available!"); + wxLogWarning(_("No XPM facility available!")); #endif break; } default: { - bitmap = new wxBitmap(name, bitmapType); + return wxBitmap(name, bitmapType); break; } } - if (!bitmap) - return NULL; - - if (bitmap->Ok()) - { - return bitmap; - } - else - { - delete bitmap; - return NULL; - } + return wxNullBitmap; } else { - char buf[300]; - sprintf(buf, "Bitmap resource specification %s not found.", resource); - wxWarning(buf); - return NULL; + wxLogWarning(_("Bitmap resource specification %s not found."), (const char*) resource); + return wxNullBitmap; } } @@ -2150,25 +2140,23 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table) * depth and appropriate type. */ -wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table) +wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table) { if (!table) - table = wxDefaultResourceTable; + table = wxDefaultResourceTable; wxItemResource *item = table->FindResource(resource); if (item) { - if (!item->GetType() || strcmp(item->GetType(), "wxIcon") != 0) + 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."), (const char*) resource); + return wxNullIcon; } 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(); @@ -2200,7 +2188,7 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table) } break; } -#ifdef __WINDOWS__ +#ifdef __WXMSW__ case RESOURCE_PLATFORM_WINDOWS: { if (!optResource && ((noColours == 0) || (noColours <= thisNoColours))) @@ -2214,7 +2202,7 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table) break; } #endif -#ifdef __X__ +#ifdef __WXGTK__ case RESOURCE_PLATFORM_X: { if (!optResource && ((noColours == 0) || (noColours <= thisNoColours))) @@ -2249,27 +2237,25 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table) } // If no matching resource, fail. if (!optResource) - return NULL; + return wxNullIcon; - char *name = optResource->GetName(); + wxString name = optResource->GetName(); int bitmapType = (int)optResource->GetValue1(); - wxIcon *icon = 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?"), (const char*) name); + return (wxIcon *) NULL; } - icon = new wxIcon((char *)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()); + return wxIcon((const char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()); #else - wxWarning("No XBM facility available!"); + wxLogWarning(_("No XBM facility available!")); #endif break; } @@ -2277,48 +2263,39 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table) { // *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS *** /* -#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WINDOWS__) && 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()); + return 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: { - icon = new wxIcon(name, bitmapType); +#ifdef __WXGTK__ + wxLogWarning(_("Icon resource specification %s not found."), (const char*) resource); +#else + return wxIcon(name, bitmapType); +#endif break; } } - if (!icon) - return NULL; - - if (icon->Ok()) - { - return icon; - } - else - { - delete icon; - return NULL; - } + return wxNullIcon; } else { - char buf[300]; - sprintf(buf, "Icon resource specification %s not found.", resource); - wxWarning(buf); - return NULL; + wxLogWarning(_("Icon resource specification %s not found."), (const char*) resource); + return (wxIcon *) NULL; } } @@ -2329,7 +2306,7 @@ wxMenu *wxResourceCreateMenu(wxItemResource *item) while (node) { wxItemResource *child = (wxItemResource *)node->Data(); - if (child->GetType() && strcmp(child->GetType(), "wxMenuSeparator") == 0) + if ((child->GetType() != "") && (child->GetType() == "wxMenuSeparator")) menu->AppendSeparator(); else if (child->GetChildren().Number() > 0) { @@ -2346,13 +2323,13 @@ wxMenu *wxResourceCreateMenu(wxItemResource *item) return menu; } -wxMenuBar *wxResourceCreateMenuBar(char *resource, wxResourceTable *table, wxMenuBar *menuBar) +wxMenuBar *wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *table, wxMenuBar *menuBar) { if (!table) table = wxDefaultResourceTable; wxItemResource *menuResource = table->FindResource(resource); - if (menuResource && menuResource->GetType() && strcmp(menuResource->GetType(), "wxMenu") == 0) + if (menuResource && (menuResource->GetType() != "") && (menuResource->GetType() == "wxMenu")) { if (!menuBar) menuBar = new wxMenuBar; @@ -2367,23 +2344,23 @@ wxMenuBar *wxResourceCreateMenuBar(char *resource, wxResourceTable *table, wxMen } return menuBar; } - return NULL; + return (wxMenuBar *) NULL; } -wxMenu *wxResourceCreateMenu(char *resource, wxResourceTable *table) +wxMenu *wxResourceCreateMenu(const wxString& resource, wxResourceTable *table) { if (!table) table = wxDefaultResourceTable; wxItemResource *menuResource = table->FindResource(resource); - if (menuResource && menuResource->GetType() && strcmp(menuResource->GetType(), "wxMenu") == 0) + if (menuResource && (menuResource->GetType() != "") && (menuResource->GetType() == "wxMenu")) // 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) -bool wxResourceParseData(char *resource, wxResourceTable *table) +bool wxResourceParseData(const wxString& resource, wxResourceTable *table) { if (!table) table = wxDefaultResourceTable; @@ -2391,7 +2368,7 @@ bool wxResourceParseData(char *resource, wxResourceTable *table) return table->ParseResourceData(resource); } -bool wxResourceParseFile(char *filename, wxResourceTable *table) +bool wxResourceParseFile(const wxString& filename, wxResourceTable *table) { if (!table) table = wxDefaultResourceTable; @@ -2400,7 +2377,7 @@ bool wxResourceParseFile(char *filename, wxResourceTable *table) } // Register XBM/XPM data -bool wxResourceRegisterBitmapData(char *name, char bits[], int width, int height, wxResourceTable *table) +bool wxResourceRegisterBitmapData(const wxString& name, char bits[], int width, int height, wxResourceTable *table) { if (!table) table = wxDefaultResourceTable; @@ -2408,7 +2385,7 @@ bool wxResourceRegisterBitmapData(char *name, char bits[], int width, int height return table->RegisterResourceBitmapData(name, bits, width, height); } -bool wxResourceRegisterBitmapData(char *name, char **data, wxResourceTable *table) +bool wxResourceRegisterBitmapData(const wxString& name, char **data, wxResourceTable *table) { if (!table) table = wxDefaultResourceTable; @@ -2428,7 +2405,7 @@ void wxResourceClear(wxResourceTable *table) * Identifiers */ -bool wxResourceAddIdentifier(char *name, int value, wxResourceTable *table) +bool wxResourceAddIdentifier(const wxString& name, int value, wxResourceTable *table) { if (!table) table = wxDefaultResourceTable; @@ -2437,7 +2414,7 @@ bool wxResourceAddIdentifier(char *name, int value, wxResourceTable *table) return TRUE; } -int wxResourceGetIdentifier(char *name, wxResourceTable *table) +int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table) { if (!table) table = wxDefaultResourceTable; @@ -2449,7 +2426,7 @@ int wxResourceGetIdentifier(char *name, wxResourceTable *table) * Parse #include file for #defines (only) */ -bool wxResourceParseIncludeFile(char *f, wxResourceTable *table) +bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table) { if (!table) table = wxDefaultResourceTable; @@ -2496,7 +2473,7 @@ static int getc_string(char *s) } } -static int ungetc_string(void) +static int ungetc_string() { wxResourceStringPtr --; return 0; @@ -2618,7 +2595,7 @@ bool wxGetResourceTokenString(char *s) with possible comments. */ -bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxResourceTable *table) +bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxResourceTable *table) { if (!table) table = wxDefaultResourceTable; @@ -2643,9 +2620,7 @@ bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxR } 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; @@ -2669,8 +2644,8 @@ bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxR 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; @@ -2679,38 +2654,38 @@ bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxR 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]; @@ -2719,21 +2694,21 @@ bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxR // = 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; } @@ -2741,9 +2716,7 @@ bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxR { 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; } } @@ -2776,7 +2749,7 @@ bool wxResourceParseString(char *s, wxResourceTable *table) } } - PrologDatabase db; + wxExprDatabase db; wxResourceStringPtr = 0; bool eof = FALSE; @@ -2802,60 +2775,90 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName, ! ((strcmp(resource->GetType(), "wxDialog") == 0) || (strcmp(resource->GetType(), "wxPanel") == 0))) return FALSE; - char *title = resource->GetTitle(); + wxString title(resource->GetTitle()); long theWindowStyle = resource->GetStyle(); bool isModal = (resource->GetValue1() != 0); int x = resource->GetX(); int y = resource->GetY(); int width = resource->GetWidth(); int height = resource->GetHeight(); - char *name = resource->GetName(); - - wxFont *theFont = resource->GetFont(); + wxString name = resource->GetName(); 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; + + // Only reset the client size if we know we're not going to do it again below. + if ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) == 0) + dialogBox->SetClientSize(width, height); + } + else if (IsKindOf(CLASSINFO(wxPanel))) + { + wxPanel* panel = (wxPanel *)this; + if (!panel->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle, name)) + return FALSE; } else { - if (!((wxWindow *)this)->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle, name)) + if (!this->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle, name)) return FALSE; } - if (theFont) - SetFont(*theFont); + if ((resource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0) + { + // No need to do this since it's done in wxPanel or wxDialog constructor. + // SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + } + else + { + if (resource->GetFont().Ok()) + SetFont(resource->GetFont()); + if (resource->GetBackgroundColour().Ok()) + SetBackgroundColour(resource->GetBackgroundColour()); + } - if (resource->GetBackgroundColour()) - SetBackgroundColour(*resource->GetBackgroundColour()); + // Should have some kind of font at this point + if (!GetFont()->Ok()) + SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + if (!GetBackgroundColour().Ok()) + SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + + // Only when we've created the window and set the font can we set the correct size, + // if based on dialog units. + if ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0) + { + wxSize sz = ConvertDialogToPixels(wxSize(width, height)); + SetClientSize(sz.x, sz.y); + + wxPoint pt = ConvertDialogToPixels(wxPoint(x, y)); + Move(pt.x, pt.y); + } - // TODO - if (resource->GetLabelColour()) - SetForegroundColour(*resource->GetLabelColour()); - else if (resource->GetButtonColour()) - SetForegroundColour(*resource->GetButtonColour()); - // Now create children wxNode *node = resource->GetChildren().First(); while (node) { wxItemResource *childResource = (wxItemResource *)node->Data(); - (void) CreateItem(childResource, table); + (void) CreateItem(childResource, resource, table); node = node->Next(); } return TRUE; } -wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxResourceTable *table) +wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxItemResource* parentResource, const wxResourceTable *table) { if (!table) table = wxDefaultResourceTable; - return table->CreateItem((wxWindow *)this, (wxItemResource *)resource); + return table->CreateItem((wxWindow *)this, resource, parentResource); } -#endif // USE_WX_RESOURCES +#ifdef _MSC_VER + #pragma warning(default:4706) // assignment within conditional expression +#endif // VC++ + +#endif // wxUSE_WX_RESOURCES