Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxWarning replaced with wxLogWarning (to solve the compilation problems due

Browse Source 
to wxWarning's const incorrectness)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-08-08 22:14:17 +00:00
parent b039c367cd
commit e17e4f282f
1 changed files with 170 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

361
src/common/resource.cpp
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98 // Created: 04/01/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem // Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -54,6 +54,8 @@
#include "wx/validate.h" #include "wx/validate.h"
#include "wx/log.h"
#if USE_WX_RESOURCES #if USE_WX_RESOURCES
#include <ctype.h> #include <ctype.h>
@@ -97,7 +99,7 @@ void wxCleanUpResourceSystem(void)
delete wxDefaultResourceTable; delete wxDefaultResourceTable;
} }
void wxWarning(char *msg) void wxLogWarning(char *msg)
{ {
wxMessageBox(msg, _("Warning"), wxOK); wxMessageBox(msg, _("Warning"), wxOK);
} }
@@ -287,7 +289,7 @@ bool wxResourceTable::ParseResourceData(char *data)
PrologDatabase db; PrologDatabase db;
if (!db.ReadPrologFromString(data)) if (!db.ReadPrologFromString(data))
{ {
wxWarning(_("Ill-formed resource file syntax.")); wxLogWarning(_("Ill-formed resource file syntax."));
return FALSE; return FALSE;
} }
@@ -343,7 +345,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
{ {
int id = childResource->GetId(); int id = childResource->GetId();
if ( id == 0 ) if ( id == 0 )
id = -1; id = -1;
wxControl *control = NULL; wxControl *control = NULL;
wxString itemType(childResource->GetType()); wxString itemType(childResource->GetType());
@@ -361,18 +363,18 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
if (bitmap) if (bitmap)
control = new wxBitmapButton(parent, id, *bitmap, control = new wxBitmapButton(parent, id, *bitmap,
wxPoint(childResource->GetX(), childResource->GetY()), wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()), wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
} }
else else
// Normal, text button // Normal, text button
control = new wxButton(parent, id, childResource->GetTitle(), control = new wxButton(parent, id, childResource->GetTitle(),
wxPoint(childResource->GetX(), childResource->GetY()), wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()), wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
} }
else if (itemType == wxString("wxMessage") || itemType == wxString("wxStaticText") || else if (itemType == wxString("wxMessage") || itemType == wxString("wxStaticText") ||
itemType == wxString("wxStaticBitmap")) itemType == wxString("wxStaticBitmap"))
{ {
if (childResource->GetValue4()) if (childResource->GetValue4())
{ {
@@ -387,7 +389,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
if (bitmap) if (bitmap)
control = new wxStaticBitmap(parent, id, *bitmap, control = new wxStaticBitmap(parent, id, *bitmap,
wxPoint(childResource->GetX(), childResource->GetY()), wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()), wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), childResource->GetName()); childResource->GetStyle(), childResource->GetName());
#endif #endif
} }
@@ -395,7 +397,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
{ {
control = new wxStaticText(parent, id, childResource->GetTitle(), control = new wxStaticText(parent, id, childResource->GetTitle(),
wxPoint(childResource->GetX(), childResource->GetY()), wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()), wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), childResource->GetName()); childResource->GetStyle(), childResource->GetName());
} }
} }
@@ -403,14 +405,14 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
{ {
control = new wxTextCtrl(parent, id, childResource->GetValue4(), control = new wxTextCtrl(parent, id, childResource->GetValue4(),
wxPoint(childResource->GetX(), childResource->GetY()), wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()), wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
} }
else if (itemType == wxString("wxCheckBox")) else if (itemType == wxString("wxCheckBox"))
{ {
control = new wxCheckBox(parent, id, childResource->GetTitle(), control = new wxCheckBox(parent, id, childResource->GetTitle(),
wxPoint(childResource->GetX(), childResource->GetY()), wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()), wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
((wxCheckBox *)control)->SetValue((childResource->GetValue1() != 0)); ((wxCheckBox *)control)->SetValue((childResource->GetValue1() != 0));
@@ -420,7 +422,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
{ {
control = new wxGauge(parent, id, (int)childResource->GetValue2(), control = new wxGauge(parent, id, (int)childResource->GetValue2(),
wxPoint(childResource->GetX(), childResource->GetY()), wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()), wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
((wxGauge *)control)->SetValue((int)childResource->GetValue1()); ((wxGauge *)control)->SetValue((int)childResource->GetValue1());
@@ -431,7 +433,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
{ {
control = new wxRadioButton(parent, id, childResource->GetTitle(), // (int)childResource->GetValue1(), control = new wxRadioButton(parent, id, childResource->GetTitle(), // (int)childResource->GetValue1(),
wxPoint(childResource->GetX(), childResource->GetY()), wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()), wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
} }
#endif #endif
@@ -460,7 +462,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
{ {
control = new wxStaticBox(parent, id, childResource->GetTitle(), control = new wxStaticBox(parent, id, childResource->GetTitle(),
wxPoint(childResource->GetX(), childResource->GetY()), wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()), wxSize(childResource->GetWidth(), childResource->GetHeight()),
childResource->GetStyle(), childResource->GetName()); childResource->GetStyle(), childResource->GetName());
} }
else if (itemType == wxString("wxListBox")) else if (itemType == wxString("wxListBox"))
@@ -483,7 +485,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
} }
control = new wxListBox(parent, id, control = new wxListBox(parent, id,
wxPoint(childResource->GetX(), childResource->GetY()), wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()), wxSize(childResource->GetWidth(), childResource->GetHeight()),
noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
if (strings) if (strings)
@@ -509,7 +511,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
} }
control = new wxChoice(parent, id, control = new wxChoice(parent, id,
wxPoint(childResource->GetX(), childResource->GetY()), wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()), wxSize(childResource->GetWidth(), childResource->GetHeight()),
noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
if (strings) if (strings)
@@ -536,7 +538,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
} }
control = new wxComboBox(parent, id, childResource->GetValue4(), control = new wxComboBox(parent, id, childResource->GetValue4(),
wxPoint(childResource->GetX(), childResource->GetY()), wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()), wxSize(childResource->GetWidth(), childResource->GetHeight()),
noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName()); noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
if (strings) if (strings)
@@ -563,9 +565,9 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
} }
control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()), control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()),
wxPoint(childResource->GetX(), childResource->GetY()), wxPoint(childResource->GetX(), childResource->GetY()),
wxSize(childResource->GetWidth(), childResource->GetHeight()), wxSize(childResource->GetWidth(), childResource->GetHeight()),
noStrings, strings, (int)childResource->GetValue1(), childResource->GetStyle(), wxDefaultValidator, noStrings, strings, (int)childResource->GetValue1(), childResource->GetStyle(), wxDefaultValidator,
childResource->GetName()); childResource->GetName());
if (strings) if (strings)
delete[] strings; delete[] strings;
@@ -586,7 +588,7 @@ bool wxResourceInterpretResources(wxResourceTable& table, PrologDatabase& db)
while (node) while (node)
{ {
PrologExpr *clause = (PrologExpr *)node->Data(); PrologExpr *clause = (PrologExpr *)node->Data();
wxString functor(clause->Functor()); wxString functor(clause->Functor());
wxItemResource *item = NULL; wxItemResource *item = NULL;
if (functor == "dialog") if (functor == "dialog")
@@ -625,13 +627,13 @@ static int g_ValidControlClassesCount = sizeof(g_ValidControlClasses) / sizeof(c
static bool wxIsValidControlClass(const wxString& c) static bool wxIsValidControlClass(const wxString& c)
{ {
int i; int i;
for ( i = 0; i < g_ValidControlClassesCount; i++) for ( i = 0; i < g_ValidControlClassesCount; i++)
{ {
if ( c == g_ValidControlClasses[i] ) if ( c == g_ValidControlClasses[i] )
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }
wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *expr, bool isPanel) wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *expr, bool isPanel)
@@ -782,44 +784,44 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
if ( expr1->Type() == PrologString || expr1->Type() == PrologWord ) if ( expr1->Type() == PrologString || expr1->Type() == PrologWord )
{ {
if ( wxIsValidControlClass(expr1->StringValue()) ) if ( wxIsValidControlClass(expr1->StringValue()) )
{ {
count = 1; count = 1;
controlType = expr1->StringValue(); controlType = expr1->StringValue();
} }
else else
{ {
wxString str(expr1->StringValue()); wxString str(expr1->StringValue());
id = wxResourceGetIdentifier(WXSTRINGCAST str, &table); id = wxResourceGetIdentifier(WXSTRINGCAST str, &table);
if (id == 0) if (id == 0)
{ {
char buf[300]; wxLogWarning(_("Could not resolve control class or id '%s'. "
sprintf(buf, _("Could not resolve control class or id '%s'. Use (non-zero) integer instead\n or provide #define (see manual for caveats)"), "Use (non-zero) integer instead\n or provide #define "
(const char*) expr1->StringValue()); "(see manual for caveats)"),
wxWarning(buf); (const char*) expr1->StringValue());
delete controlItem; delete controlItem;
return NULL; return NULL;
} }
else else
{ {
// Success - we have an id, so the 2nd element must be the control class. // Success - we have an id, so the 2nd element must be the control class.
controlType = expr->Nth(1)->StringValue(); controlType = expr->Nth(1)->StringValue();
count = 2; count = 2;
} }
} }
} }
else if (expr1->Type() == PrologInteger) else if (expr1->Type() == PrologInteger)
{ {
id = (int)expr1->IntegerValue(); id = (int)expr1->IntegerValue();
// Success - we have an id, so the 2nd element must be the control class. // Success - we have an id, so the 2nd element must be the control class.
controlType = expr->Nth(1)->StringValue(); controlType = expr->Nth(1)->StringValue();
count = 2; count = 2;
} }
expr1 = expr->Nth(count); expr1 = expr->Nth(count);
count ++; count ++;
if ( expr1 ) if ( expr1 )
title = expr1->StringValue(); title = expr1->StringValue();
expr1 = expr->Nth(count); expr1 = expr->Nth(count);
count ++; count ++;
@@ -877,9 +879,9 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
{ {
// Check for default value // Check for default value
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger)) if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
{ {
controlItem->SetValue1(expr->Nth(count)->IntegerValue()); controlItem->SetValue1(expr->Nth(count)->IntegerValue());
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
} }
@@ -889,9 +891,9 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
{ {
// Check for default value // Check for default value
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger)) if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
{ {
controlItem->SetValue1(expr->Nth(count)->IntegerValue()); controlItem->SetValue1(expr->Nth(count)->IntegerValue());
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
} }
@@ -901,20 +903,20 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
{ {
// Check for default value // Check for default value
if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord))) if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
{ {
wxString str(expr->Nth(count)->StringValue()); wxString str(expr->Nth(count)->StringValue());
controlItem->SetValue4(WXSTRINGCAST str); controlItem->SetValue4(WXSTRINGCAST str);
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
{ {
// controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count))); // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
// Do nothing - no label font any more // Do nothing - no label font any more
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
} }
} }
} }
else if (controlType == "wxMessage" || controlType == "wxStaticText") else if (controlType == "wxMessage" || controlType == "wxStaticText")
{ {
@@ -937,87 +939,87 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
{ {
// Check for default value // Check for default value
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger)) if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
{ {
controlItem->SetValue1(expr->Nth(count)->IntegerValue()); controlItem->SetValue1(expr->Nth(count)->IntegerValue());
count ++; count ++;
// Check for range // Check for range
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger)) if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
{ {
controlItem->SetValue2(expr->Nth(count)->IntegerValue()); controlItem->SetValue2(expr->Nth(count)->IntegerValue());
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
{ {
// controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count))); // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
// Do nothing // Do nothing
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
} }
} }
} }
} }
else if (controlType == "wxSlider") else if (controlType == "wxSlider")
{ {
// Check for default value // Check for default value
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger)) if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
{ {
controlItem->SetValue1(expr->Nth(count)->IntegerValue()); controlItem->SetValue1(expr->Nth(count)->IntegerValue());
count ++; count ++;
// Check for min // Check for min
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger)) if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
{ {
controlItem->SetValue2(expr->Nth(count)->IntegerValue()); controlItem->SetValue2(expr->Nth(count)->IntegerValue());
count ++; count ++;
// Check for max // Check for max
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger)) if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
{ {
controlItem->SetValue3(expr->Nth(count)->IntegerValue()); controlItem->SetValue3(expr->Nth(count)->IntegerValue());
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
{ {
// controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count))); // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
// do nothing // do nothing
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
} }
} }
} }
} }
} }
else if (controlType == "wxScrollBar") else if (controlType == "wxScrollBar")
{ {
// DEFAULT VALUE // DEFAULT VALUE
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger)) if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
{ {
controlItem->SetValue1(expr->Nth(count)->IntegerValue()); controlItem->SetValue1(expr->Nth(count)->IntegerValue());
count ++; count ++;
// PAGE LENGTH // PAGE LENGTH
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger)) if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
{ {
controlItem->SetValue2(expr->Nth(count)->IntegerValue()); controlItem->SetValue2(expr->Nth(count)->IntegerValue());
count ++; count ++;
// OBJECT LENGTH // OBJECT LENGTH
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger)) if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
{ {
controlItem->SetValue3(expr->Nth(count)->IntegerValue()); controlItem->SetValue3(expr->Nth(count)->IntegerValue());
count ++; count ++;
// VIEW LENGTH // VIEW LENGTH
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger)) if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
controlItem->SetValue5(expr->Nth(count)->IntegerValue()); controlItem->SetValue5(expr->Nth(count)->IntegerValue());
} }
} }
} }
} }
else if (controlType == "wxListBox") else if (controlType == "wxListBox")
{ {
@@ -1033,7 +1035,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
stringExpr = stringExpr->GetNext(); stringExpr = stringExpr->GetNext();
} }
controlItem->SetStringValues(stringList); controlItem->SetStringValues(stringList);
count ++; count ++;
// Check for wxSINGLE/wxMULTIPLE // Check for wxSINGLE/wxMULTIPLE
PrologExpr *mult = NULL; PrologExpr *mult = NULL;
@@ -1045,16 +1047,16 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
controlItem->SetValue1(wxLB_MULTIPLE); controlItem->SetValue1(wxLB_MULTIPLE);
else if (m == "wxEXTENDED") else if (m == "wxEXTENDED")
controlItem->SetValue1(wxLB_EXTENDED); controlItem->SetValue1(wxLB_EXTENDED);
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
{ {
// controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count))); // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
} }
} }
} }
} }
else if (controlType == "wxChoice") else if (controlType == "wxChoice")
{ {
@@ -1071,28 +1073,28 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
} }
controlItem->SetStringValues(stringList); controlItem->SetStringValues(stringList);
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
{ {
// controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count))); // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
} }
} }
} }
#if USE_COMBOBOX #if USE_COMBOBOX
else if (controlType == "wxComboBox") else if (controlType == "wxComboBox")
{ {
PrologExpr *textValue = expr->Nth(count); PrologExpr *textValue = expr->Nth(count);
if (textValue && (textValue->Type() == PrologString || textValue->Type() == PrologWord)) if (textValue && (textValue->Type() == PrologString || textValue->Type() == PrologWord))
{ {
wxString str(textValue->StringValue()); wxString str(textValue->StringValue());
controlItem->SetValue4(WXSTRINGCAST str); controlItem->SetValue4(WXSTRINGCAST str);
count ++; count ++;
PrologExpr *valueList = NULL; PrologExpr *valueList = NULL;
// Check for default value list // Check for default value list
@@ -1107,18 +1109,18 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
} }
controlItem->SetStringValues(stringList); controlItem->SetStringValues(stringList);
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
{ {
// controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count))); // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
} }
} }
} }
} }
#endif #endif
#if 0 #if 0
@@ -1136,26 +1138,26 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
stringExpr = stringExpr->GetNext(); stringExpr = stringExpr->GetNext();
} }
controlItem->SetStringValues(stringList); controlItem->SetStringValues(stringList);
count ++; count ++;
// majorDim (number of rows or cols) // majorDim (number of rows or cols)
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger)) if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
{ {
controlItem->SetValue1(expr->Nth(count)->IntegerValue()); controlItem->SetValue1(expr->Nth(count)->IntegerValue());
count ++; count ++;
} }
else else
controlItem->SetValue1(0); controlItem->SetValue1(0);
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
{ {
// controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count))); // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
count ++; count ++;
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
} }
} }
} }
#endif #endif
else else
@@ -1208,10 +1210,10 @@ wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, PrologExpr *
id = wxResourceGetIdentifier(WXSTRINGCAST str, &table); id = wxResourceGetIdentifier(WXSTRINGCAST str, &table);
if (id == 0) if (id == 0)
{ {
char buf[300]; wxLogWarning(_("Could not resolve menu id '%s'. "
sprintf(buf, _("Could not resolve menu id '%s'. Use (non-zero) integer instead\n or provide #define (see manual for caveats)"), "Use (non-zero) integer instead\n"
(const char*) idExpr->StringValue()); "or provide #define (see manual for caveats)"),
wxWarning(buf); (const char*) idExpr->StringValue());
} }
} }
else if (idExpr->Type() == PrologInteger) else if (idExpr->Type() == PrologInteger)
@@ -1630,9 +1632,7 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour
} }
else else
{ {
char buf[300]; wxLogWarning(_("#define %s must be an integer."), name);
sprintf(buf, _("#define %s must be an integer."), name);
wxWarning(buf);
delete[] name; delete[] name;
delete[] value; delete[] value;
return FALSE; return FALSE;
@@ -1654,9 +1654,7 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour
name[len-1] = 0; name[len-1] = 0;
if (!wxResourceParseIncludeFile(actualName, table)) if (!wxResourceParseIncludeFile(actualName, table))
{ {
char buf[400]; wxLogWarning(_("Could not find resource include file %s."), actualName);
sprintf(buf, _("Could not find resource include file %s."), actualName);
wxWarning(buf);
} }
delete[] name; delete[] name;
return TRUE; return TRUE;
@@ -1667,35 +1665,35 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour
strcpy(buf, _("Found ")); strcpy(buf, _("Found "));
strncat(buf, wxResourceBuffer, 30); strncat(buf, wxResourceBuffer, 30);
strcat(buf, _(", expected static, #include or #define\nwhilst parsing resource.")); strcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
wxWarning(buf); wxLogWarning(buf);
return FALSE; return FALSE;
} }
// char // char
if (!wxGetResourceToken(fd)) if (!wxGetResourceToken(fd))
{ {
wxWarning(_("Unexpected end of file whilst parsing resource.")); wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE; *eof = TRUE;
return FALSE; return FALSE;
} }
if (strcmp(wxResourceBuffer, "char") != 0) if (strcmp(wxResourceBuffer, "char") != 0)
{ {
wxWarning(_("Expected 'char' whilst parsing resource.")); wxLogWarning(_("Expected 'char' whilst parsing resource."));
return FALSE; return FALSE;
} }
// *name // *name
if (!wxGetResourceToken(fd)) if (!wxGetResourceToken(fd))
{ {
wxWarning(_("Unexpected end of file whilst parsing resource.")); wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE; *eof = TRUE;
return FALSE; return FALSE;
} }
if (wxResourceBuffer[0] != '*') if (wxResourceBuffer[0] != '*')
{ {
wxWarning(_("Expected '*' whilst parsing resource.")); wxLogWarning(_("Expected '*' whilst parsing resource."));
return FALSE; return FALSE;
} }
char nameBuf[100]; char nameBuf[100];
@@ -1704,21 +1702,21 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour
// = // =
if (!wxGetResourceToken(fd)) if (!wxGetResourceToken(fd))
{ {
wxWarning(_("Unexpected end of file whilst parsing resource.")); wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE; *eof = TRUE;
return FALSE; return FALSE;
} }
if (strcmp(wxResourceBuffer, "=") != 0) if (strcmp(wxResourceBuffer, "=") != 0)
{ {
wxWarning(_("Expected '=' whilst parsing resource.")); wxLogWarning(_("Expected '=' whilst parsing resource."));
return FALSE; return FALSE;
} }
// String // String
if (!wxGetResourceToken(fd)) if (!wxGetResourceToken(fd))
{ {
wxWarning(_("Unexpected end of file whilst parsing resource.")); wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE; *eof = TRUE;
return FALSE; return FALSE;
} }
@@ -1726,9 +1724,7 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour
{ {
if (!db.ReadPrologFromString(wxResourceBuffer)) if (!db.ReadPrologFromString(wxResourceBuffer))
{ {
char buf[300]; wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
sprintf(buf, _("%s: ill-formed resource file syntax."), nameBuf);
wxWarning(buf);
return FALSE; return FALSE;
} }
} }
@@ -2059,9 +2055,7 @@ long wxParseWindowStyle(char *bitListString)
} }
if (!found) if (!found)
{ {
char buf[200]; wxLogWarning(_("Unrecognized style %s whilst parsing resource."), word);
sprintf(buf, _("Unrecognized style %s whilst parsing resource."), word);
wxWarning(buf);
return 0; return 0;
} }
} }
@@ -2083,9 +2077,7 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
{ {
if (!item->GetType() || strcmp(item->GetType(), "wxBitmap") != 0) if (!item->GetType() || strcmp(item->GetType(), "wxBitmap") != 0)
{ {
char buf[300]; wxLogWarning(_("%s not a bitmap resource specification."), resource);
sprintf(buf, _("%s not a bitmap resource specification."), resource);
wxWarning(buf);
return NULL; return NULL;
} }
int thisDepth = wxDisplayDepth(); int thisDepth = wxDisplayDepth();
@@ -2185,14 +2177,13 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
wxItemResource *item = table->FindResource(name); wxItemResource *item = table->FindResource(name);
if (!item) if (!item)
{ {
char buf[400]; wxLogWarning(_("Failed to find XBM resource %s.\n"
sprintf(buf, _("Failed to find XBM resource %s.\nForgot to use wxResourceLoadBitmapData?"), name); "Forgot to use wxResourceLoadBitmapData?"), name);
wxWarning(buf);
return NULL; return NULL;
} }
bitmap = new wxBitmap((char *)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()); bitmap = new wxBitmap((char *)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
#else #else
wxWarning(_("No XBM facility available!")); wxLogWarning(_("No XBM facility available!"));
#endif #endif
break; break;
} }
@@ -2202,14 +2193,13 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
wxItemResource *item = table->FindResource(name); wxItemResource *item = table->FindResource(name);
if (!item) if (!item)
{ {
char buf[400]; wxLogWarning(_("Failed to find XPM resource %s.\n"
sprintf(buf, _("Failed to find XPM resource %s.\nForgot to use wxResourceLoadBitmapData?"), name); "Forgot to use wxResourceLoadBitmapData?"), name);
wxWarning(buf);
return NULL; return NULL;
} }
bitmap = new wxBitmap(item->GetValue1()); bitmap = new wxBitmap(item->GetValue1());
#else #else
wxWarning(_("No XPM facility available!")); wxLogWarning(_("No XPM facility available!"));
#endif #endif
break; break;
} }
@@ -2234,9 +2224,7 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
} }
else else
{ {
char buf[300]; wxLogWarning(_("Bitmap resource specification %s not found."), resource);
sprintf(buf, _("Bitmap resource specification %s not found."), resource);
wxWarning(buf);
return NULL; return NULL;
} }
} }
@@ -2256,9 +2244,7 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
{ {
if (!item->GetType() || strcmp(item->GetType(), "wxIcon") != 0) if (!item->GetType() || strcmp(item->GetType(), "wxIcon") != 0)
{ {
char buf[300]; wxLogWarning(_("%s not an icon resource specification."), resource);
sprintf(buf, _("%s not an icon resource specification."), resource);
wxWarning(buf);
return NULL; return NULL;
} }
int thisDepth = wxDisplayDepth(); int thisDepth = wxDisplayDepth();
@@ -2358,14 +2344,13 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
wxItemResource *item = table->FindResource(name); wxItemResource *item = table->FindResource(name);
if (!item) if (!item)
{ {
char buf[400]; wxLogWarning(_("Failed to find XBM resource %s.\n"
sprintf(buf, _("Failed to find XBM resource %s.\nForgot to use wxResourceLoadIconData?"), name); "Forgot to use wxResourceLoadIconData?"), name);
wxWarning(buf);
return NULL; return 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 #else
wxWarning(_("No XBM facility available!")); wxLogWarning(_("No XBM facility available!"));
#endif #endif
break; break;
} }
@@ -2379,15 +2364,15 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
{ {
char buf[400]; char buf[400];
sprintf(buf, _("Failed to find XPM resource %s.\nForgot to use wxResourceLoadIconData?"), name); sprintf(buf, _("Failed to find XPM resource %s.\nForgot to use wxResourceLoadIconData?"), name);
wxWarning(buf); wxLogWarning(buf);
return NULL; return NULL;
} }
icon = new wxIcon((char **)item->GetValue1()); icon = new wxIcon((char **)item->GetValue1());
#else #else
wxWarning(_("No XPM facility available!")); wxLogWarning(_("No XPM facility available!"));
#endif #endif
*/ */
wxWarning(_("No XPM icon facility available!")); wxLogWarning(_("No XPM icon facility available!"));
break; break;
} }
default: default:
@@ -2411,9 +2396,7 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
} }
else else
{ {
char buf[300]; wxLogWarning(_("Icon resource specification %s not found."), resource);
sprintf(buf, _("Icon resource specification %s not found."), resource);
wxWarning(buf);
return NULL; return NULL;
} }
} }
@@ -2739,9 +2722,7 @@ bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxR
} }
else else
{ {
char buf[300]; wxLogWarning(_("#define %s must be an integer."), name);
sprintf(buf, _("#define %s must be an integer."), name);
wxWarning(buf);
delete[] name; delete[] name;
delete[] value; delete[] value;
return FALSE; return FALSE;
@@ -2766,7 +2747,7 @@ bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxR
{ {
char buf[400]; char buf[400];
sprintf(buf, _("Could not find resource include file %s."), actualName); sprintf(buf, _("Could not find resource include file %s."), actualName);
wxWarning(buf); wxLogWarning(buf);
} }
delete[] name; delete[] name;
return TRUE; return TRUE;
@@ -2778,35 +2759,35 @@ bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxR
strcpy(buf, _("Found ")); strcpy(buf, _("Found "));
strncat(buf, wxResourceBuffer, 30); strncat(buf, wxResourceBuffer, 30);
strcat(buf, _(", expected static, #include or #define\nwhilst parsing resource.")); strcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
wxWarning(buf); wxLogWarning(buf);
return FALSE; return FALSE;
} }
// char // char
if (!wxGetResourceTokenString(s)) if (!wxGetResourceTokenString(s))
{ {
wxWarning(_("Unexpected end of file whilst parsing resource.")); wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE; *eof = TRUE;
return FALSE; return FALSE;
} }
if (strcmp(wxResourceBuffer, "char") != 0) if (strcmp(wxResourceBuffer, "char") != 0)
{ {
wxWarning(_("Expected 'char' whilst parsing resource.")); wxLogWarning(_("Expected 'char' whilst parsing resource."));
return FALSE; return FALSE;
} }
// *name // *name
if (!wxGetResourceTokenString(s)) if (!wxGetResourceTokenString(s))
{ {
wxWarning(_("Unexpected end of file whilst parsing resource.")); wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE; *eof = TRUE;
return FALSE; return FALSE;
} }
if (wxResourceBuffer[0] != '*') if (wxResourceBuffer[0] != '*')
{ {
wxWarning(_("Expected '*' whilst parsing resource.")); wxLogWarning(_("Expected '*' whilst parsing resource."));
return FALSE; return FALSE;
} }
char nameBuf[100]; char nameBuf[100];
@@ -2815,21 +2796,21 @@ bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxR
// = // =
if (!wxGetResourceTokenString(s)) if (!wxGetResourceTokenString(s))
{ {
wxWarning(_("Unexpected end of file whilst parsing resource.")); wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE; *eof = TRUE;
return FALSE; return FALSE;
} }
if (strcmp(wxResourceBuffer, "=") != 0) if (strcmp(wxResourceBuffer, "=") != 0)
{ {
wxWarning(_("Expected '=' whilst parsing resource.")); wxLogWarning(_("Expected '=' whilst parsing resource."));
return FALSE; return FALSE;
} }
// String // String
if (!wxGetResourceTokenString(s)) if (!wxGetResourceTokenString(s))
{ {
wxWarning(_("Unexpected end of file whilst parsing resource.")); wxLogWarning(_("Unexpected end of file whilst parsing resource."));
*eof = TRUE; *eof = TRUE;
return FALSE; return FALSE;
} }
@@ -2837,9 +2818,7 @@ bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxR
{ {
if (!db.ReadPrologFromString(wxResourceBuffer)) if (!db.ReadPrologFromString(wxResourceBuffer))
{ {
char buf[300]; wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
sprintf(buf, _("%s: ill-formed resource file syntax."), nameBuf);
wxWarning(buf);
return FALSE; return FALSE;
} }
} }
@@ -2912,7 +2891,7 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
if (IsKindOf(CLASSINFO(wxDialog))) if (IsKindOf(CLASSINFO(wxDialog)))
{ {
wxDialog *dialogBox = (wxDialog *)this; 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)) if (!dialogBox->Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), theWindowStyle|modalStyle, name))
return FALSE; return FALSE;
dialogBox->SetClientSize(width, height); dialogBox->SetClientSize(width, height);
@@ -2929,7 +2908,7 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
if (resource->GetBackgroundColour()) if (resource->GetBackgroundColour())
SetBackgroundColour(*resource->GetBackgroundColour()); SetBackgroundColour(*resource->GetBackgroundColour());
// TODO // TODO
if (resource->GetLabelColour()) if (resource->GetLabelColour())
SetForegroundColour(*resource->GetLabelColour()); SetForegroundColour(*resource->GetLabelColour());
else if (resource->GetButtonColour()) else if (resource->GetButtonColour())