#include "wx/button.h"
#include "wx/bmpbuttn.h"
#include "wx/radiobox.h"
-#include "wx/radiobut.h"
#include "wx/listbox.h"
#include "wx/choice.h"
#include "wx/checkbox.h"
#include "wx/settings.h"
#include "wx/slider.h"
+#include "wx/icon.h"
#include "wx/statbox.h"
#include "wx/statbmp.h"
-#if wxUSE_GAUGE
#include "wx/gauge.h"
-#endif
#include "wx/textctrl.h"
#include "wx/msgdlg.h"
#include "wx/intl.h"
#endif
-#if wxUSE_RADIOBUTTON
+#if wxUSE_RADIOBTN
#include "wx/radiobut.h"
#endif
wxMessageBox(msg, _("Warning"), wxOK);
}
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)
-#endif
wxItemResource::wxItemResource()
{
wxItemResource *wxResourceTable::FindResource(const wxString& name) const
{
- wxItemResource *item = (wxItemResource *)Get((char *)(const char *)name);
+ wxItemResource *item = (wxItemResource *)Get(WXSTRINGCAST name);
return item;
}
void wxResourceTable::AddResource(wxItemResource *item)
{
wxString name = item->GetName();
- if (name == "")
+ if (name == wxT(""))
name = item->GetTitle();
- if (name == "")
- name = "no name";
+ if (name == wxT(""))
+ name = wxT("no name");
// Delete existing resource, if any.
Delete(name);
bool wxResourceTable::DeleteResource(const wxString& name)
{
- wxItemResource *item = (wxItemResource *)Delete((char *)(const char *)name);
+ wxItemResource *item = (wxItemResource *)Delete(WXSTRINGCAST name);
if (item)
{
// See if any resource has this as its child; if so, delete from
// parent's child list.
BeginFind();
wxNode *node = (wxNode *) NULL;
- while ((node = Next()))
+ node = Next();
+ while (node != NULL)
{
wxItemResource *parent = (wxItemResource *)node->Data();
if (parent->GetChildren().Member(item))
parent->GetChildren().DeleteObject(item);
break;
}
+ node = Next();
}
delete item;
{
wxExprDatabase db;
- FILE *fd = fopen((const char*) filename, "r");
+#ifdef __WXMAC__
+ FILE *fd = fopen(wxUnix2MacFilename(filename.fn_str()), "r");
+#else
+ FILE *fd = fopen(filename.fn_str(), "r");
+#endif
if (!fd)
return FALSE;
bool eof = FALSE;
// Register pre-loaded bitmap data
wxItemResource *item = new wxItemResource;
// item->SetType(wxRESOURCE_TYPE_XBM_DATA);
- item->SetType("wxXBMData");
+ item->SetType(wxT("wxXBMData"));
item->SetName(name);
item->SetValue1((long)bits);
item->SetValue2((long)width);
// Register pre-loaded bitmap data
wxItemResource *item = new wxItemResource;
// item->SetType(wxRESOURCE_TYPE_XPM_DATA);
- item->SetType("wxXPMData");
+ item->SetType(wxT("wxXPMData"));
item->SetName(name);
item->SetValue1((long)data);
AddResource(item);
size = wxSize(childResource->GetWidth(), childResource->GetHeight());
}
- if (itemType == wxString("wxButton") || itemType == wxString("wxBitmapButton"))
+ if (itemType == wxString(wxT("wxButton")) || itemType == wxString(wxT("wxBitmapButton")))
{
- if (childResource->GetValue4() != "")
+ if (childResource->GetValue4() != wxT(""))
{
// Bitmap button
wxBitmap bitmap = childResource->GetBitmap();
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"))
+ else if (itemType == wxString(wxT("wxMessage")) || itemType == wxString(wxT("wxStaticText")) ||
+ itemType == wxString(wxT("wxStaticBitmap")))
{
- if (childResource->GetValue4() != "")
+ if (childResource->GetValue4() != wxT(""))
{
// Bitmap message
wxBitmap bitmap = childResource->GetBitmap();
childResource->GetStyle(), childResource->GetName());
}
}
- else if (itemType == wxString("wxText") || itemType == wxString("wxTextCtrl") || itemType == wxString("wxMultiText"))
+ else if (itemType == wxString(wxT("wxText")) || itemType == wxString(wxT("wxTextCtrl")) || itemType == wxString(wxT("wxMultiText")))
{
control = new wxTextCtrl(parent, id, childResource->GetValue4(), pos, size,
childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
}
- else if (itemType == wxString("wxCheckBox"))
+ else if (itemType == wxString(wxT("wxCheckBox")))
{
control = new wxCheckBox(parent, id, childResource->GetTitle(), pos, size,
childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
((wxCheckBox *)control)->SetValue((childResource->GetValue1() != 0));
}
#if wxUSE_GAUGE
- else if (itemType == wxString("wxGauge"))
+ else if (itemType == wxString(wxT("wxGauge")))
{
control = new wxGauge(parent, id, (int)childResource->GetValue2(), pos, size,
childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
((wxGauge *)control)->SetValue((int)childResource->GetValue1());
}
#endif
-#if wxUSE_RADIOBUTTON
- else if (itemType == wxString("wxRadioButton"))
+#if wxUSE_RADIOBTN
+ else if (itemType == wxString(wxT("wxRadioButton")))
{
control = new wxRadioButton(parent, id, childResource->GetTitle(), // (int)childResource->GetValue1(),
pos, size,
}
#endif
#if wxUSE_SCROLLBAR
- else if (itemType == wxString("wxScrollBar"))
+ else if (itemType == wxString(wxT("wxScrollBar")))
{
control = new wxScrollBar(parent, id, pos, size,
childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
}
#endif
- else if (itemType == wxString("wxSlider"))
+ else if (itemType == wxString(wxT("wxSlider")))
{
control = new wxSlider(parent, id, (int)childResource->GetValue1(),
(int)childResource->GetValue2(), (int)childResource->GetValue3(), pos, size,
childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
}
- else if (itemType == wxString("wxGroupBox") || itemType == wxString("wxStaticBox"))
+ else if (itemType == wxString(wxT("wxGroupBox")) || itemType == wxString(wxT("wxStaticBox")))
{
control = new wxStaticBox(parent, id, childResource->GetTitle(), pos, size,
childResource->GetStyle(), childResource->GetName());
}
- else if (itemType == wxString("wxListBox"))
+ else if (itemType == wxString(wxT("wxListBox")))
{
wxStringList& stringList = childResource->GetStringValues();
wxString *strings = (wxString *) NULL;
int i = 0;
while (node)
{
- strings[i] = (char *)node->Data();
+ strings[i] = (wxChar *)node->Data();
i ++;
node = node->Next();
}
if (strings)
delete[] strings;
}
- else if (itemType == wxString("wxChoice"))
+ else if (itemType == wxString(wxT("wxChoice")))
{
wxStringList& stringList = childResource->GetStringValues();
wxString *strings = (wxString *) NULL;
int i = 0;
while (node)
{
- strings[i] = (char *)node->Data();
+ strings[i] = (wxChar *)node->Data();
i ++;
node = node->Next();
}
delete[] strings;
}
#if wxUSE_COMBOBOX
- else if (itemType == wxString("wxComboBox"))
+ else if (itemType == wxString(wxT("wxComboBox")))
{
wxStringList& stringList = childResource->GetStringValues();
wxString *strings = (wxString *) NULL;
int i = 0;
while (node)
{
- strings[i] = (char *)node->Data();
+ strings[i] = (wxChar *)node->Data();
i ++;
node = node->Next();
}
delete[] strings;
}
#endif
- else if (itemType == wxString("wxRadioBox"))
+ else if (itemType == wxString(wxT("wxRadioBox")))
{
wxStringList& stringList = childResource->GetStringValues();
wxString *strings = (wxString *) NULL;
int i = 0;
while (node)
{
- strings[i] = (char *)node->Data();
+ strings[i] = (wxChar *)node->Data();
i ++;
node = node->Next();
}
wxString functor(clause->Functor());
wxItemResource *item = (wxItemResource *) NULL;
- if (functor == "dialog")
+ if (functor == wxT("dialog"))
item = wxResourceInterpretDialog(table, clause);
- else if (functor == "panel")
+ else if (functor == wxT("panel"))
item = wxResourceInterpretDialog(table, clause, TRUE);
- else if (functor == "menubar")
+ else if (functor == wxT("menubar"))
item = wxResourceInterpretMenuBar(table, clause);
- else if (functor == "menu")
+ else if (functor == wxT("menu"))
item = wxResourceInterpretMenu(table, clause);
- else if (functor == "string")
+ else if (functor == wxT("string"))
item = wxResourceInterpretString(table, clause);
- else if (functor == "bitmap")
+ else if (functor == wxT("bitmap"))
item = wxResourceInterpretBitmap(table, clause);
- else if (functor == "icon")
+ else if (functor == wxT("icon"))
item = wxResourceInterpretIcon(table, clause);
if (item)
{
// Remove any existing resource of same name
- if (item->GetName() != "")
+ if (item->GetName() != wxT(""))
table.DeleteResource(item->GetName());
table.AddResource(item);
}
return TRUE;
}
-static const char *g_ValidControlClasses[] =
+static const wxChar *g_ValidControlClasses[] =
{
- "wxButton",
- "wxBitmapButton",
- "wxMessage",
- "wxStaticText",
- "wxStaticBitmap",
- "wxText",
- "wxTextCtrl",
- "wxMultiText",
- "wxListBox",
- "wxRadioBox",
- "wxRadioButton",
- "wxCheckBox",
- "wxBitmapCheckBox",
- "wxGroupBox",
- "wxStaticBox",
- "wxSlider",
- "wxGauge",
- "wxScrollBar",
- "wxChoice",
- "wxComboBox"
+ wxT("wxButton"),
+ wxT("wxBitmapButton"),
+ wxT("wxMessage"),
+ wxT("wxStaticText"),
+ wxT("wxStaticBitmap"),
+ wxT("wxText"),
+ wxT("wxTextCtrl"),
+ wxT("wxMultiText"),
+ wxT("wxListBox"),
+ wxT("wxRadioBox"),
+ wxT("wxRadioButton"),
+ wxT("wxCheckBox"),
+ wxT("wxBitmapCheckBox"),
+ wxT("wxGroupBox"),
+ wxT("wxStaticBox"),
+ wxT("wxSlider"),
+ wxT("wxGauge"),
+ wxT("wxScrollBar"),
+ wxT("wxChoice"),
+ wxT("wxComboBox")
};
static bool wxIsValidControlClass(const wxString& c)
{
wxItemResource *dialogItem = new wxItemResource;
if (isPanel)
- dialogItem->SetType("wxPanel");
+ dialogItem->SetType(wxT("wxPanel"));
else
- dialogItem->SetType("wxDialog");
- wxString style = "";
- wxString title = "";
- wxString name = "";
- wxString backColourHex = "";
- wxString labelColourHex = "";
- wxString buttonColourHex = "";
+ dialogItem->SetType(wxT("wxDialog"));
+ wxString style = wxT("");
+ wxString title = wxT("");
+ wxString name = wxT("");
+ wxString backColourHex = wxT("");
+ wxString labelColourHex = wxT("");
+ wxString buttonColourHex = wxT("");
long windowStyle = wxDEFAULT_DIALOG_STYLE;
if (isPanel)
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);
+ expr->GetAttributeValue(wxT("style"), style);
+ expr->GetAttributeValue(wxT("name"), name);
+ expr->GetAttributeValue(wxT("title"), title);
+ expr->GetAttributeValue(wxT("x"), x);
+ expr->GetAttributeValue(wxT("y"), y);
+ expr->GetAttributeValue(wxT("width"), width);
+ expr->GetAttributeValue(wxT("height"), height);
+ expr->GetAttributeValue(wxT("modal"), isModal);
+ expr->GetAttributeValue(wxT("label_font"), &labelFontExpr);
+ expr->GetAttributeValue(wxT("button_font"), &buttonFontExpr);
+ expr->GetAttributeValue(wxT("font"), &fontExpr);
+ expr->GetAttributeValue(wxT("background_colour"), backColourHex);
+ expr->GetAttributeValue(wxT("label_colour"), labelColourHex);
+ expr->GetAttributeValue(wxT("button_colour"), buttonColourHex);
int useDialogUnits = 0;
- expr->GetAttributeValue("use_dialog_units", useDialogUnits);
+ expr->GetAttributeValue(wxT("use_dialog_units"), useDialogUnits);
if (useDialogUnits != 0)
dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_DIALOG_UNITS);
int useDefaults = 0;
- expr->GetAttributeValue("use_system_defaults", useDefaults);
+ expr->GetAttributeValue(wxT("use_system_defaults"), useDefaults);
if (useDefaults != 0)
dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_USE_DEFAULTS);
- long id = 0;
- expr->GetAttributeValue("id", id);
+ int id = 0;
+ expr->GetAttributeValue(wxT("id"), id);
dialogItem->SetId(id);
- if (style != "")
+ if (style != wxT(""))
{
windowStyle = wxParseWindowStyle(style);
}
dialogItem->SetStyle(windowStyle);
dialogItem->SetValue1(isModal);
+ if (windowStyle & wxDIALOG_MODAL) // Uses style in wxWin 2
+ dialogItem->SetValue1(TRUE);
+
dialogItem->SetName(name);
dialogItem->SetTitle(title);
dialogItem->SetSize(x, y, width, height);
- if (backColourHex != "")
+ if (backColourHex != wxT(""))
{
int r = 0;
int g = 0;
b = wxHexToDec(backColourHex.Mid(4, 2));
dialogItem->SetBackgroundColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
}
- if (labelColourHex != "")
+ if (labelColourHex != wxT(""))
{
int r = 0;
int g = 0;
b = wxHexToDec(labelColourHex.Mid(4, 2));
dialogItem->SetLabelColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
}
- if (buttonColourHex != "")
+ if (buttonColourHex != wxT(""))
{
int r = 0;
int g = 0;
if (controlExpr->Number() == 3)
{
wxString controlKeyword(controlExpr->Nth(1)->StringValue());
- if (controlKeyword != "" && controlKeyword == "control")
+ if (controlKeyword != wxT("") && controlKeyword == wxT("control"))
{
// The value part: always a list.
wxExpr *listExpr = controlExpr->Nth(2);
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());
+ (const wxChar*) expr1->StringValue());
delete controlItem;
return (wxItemResource *) NULL;
}
controlItem->SetType(controlType);
controlItem->SetId(id);
- if (controlType == "wxButton")
+ if (controlType == wxT("wxButton"))
{
// Check for bitmap resource name (in case loading old-style resource file)
if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
{
- count ++;
wxString str(expr->Nth(count)->StringValue());
+ count ++;
- if (str != "")
+ if (str != wxT(""))
{
controlItem->SetValue4(str);
- controlItem->SetType("wxBitmapButton");
+ controlItem->SetType(wxT("wxBitmapButton"));
}
}
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
}
- else if (controlType == "wxBitmapButton")
+ else if (controlType == wxT("wxBitmapButton"))
{
// Check for bitmap resource name
if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
}
}
- else if (controlType == "wxCheckBox")
+ else if (controlType == wxT("wxCheckBox"))
{
// Check for default value
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
}
}
-#if wxUSE_RADIOBUTTON
- else if (controlType == "wxRadioButton")
+#if wxUSE_RADIOBTN
+ else if (controlType == wxT("wxRadioButton"))
{
// Check for default value
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
}
}
#endif
- else if (controlType == "wxText" || controlType == "wxTextCtrl" || controlType == "wxMultiText")
+ else if (controlType == wxT("wxText") || controlType == wxT("wxTextCtrl") || controlType == wxT("wxMultiText"))
{
// Check for default value
if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
}
}
}
- else if (controlType == "wxMessage" || controlType == "wxStaticText")
+ else if (controlType == wxT("wxMessage") || controlType == wxT("wxStaticText"))
{
// Check for bitmap resource name (in case it's an old-style .wxr file)
if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
wxString str(expr->Nth(count)->StringValue());
controlItem->SetValue4(str);
count ++;
- controlItem->SetType("wxStaticText");
+ controlItem->SetType(wxT("wxStaticText"));
}
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
}
- else if (controlType == "wxStaticBitmap")
+ else if (controlType == wxT("wxStaticBitmap"))
{
// Check for bitmap resource name
if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
}
- else if (controlType == "wxGroupBox" || controlType == "wxStaticBox")
+ else if (controlType == wxT("wxGroupBox") || controlType == wxT("wxStaticBox"))
{
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
}
- else if (controlType == "wxGauge")
+ else if (controlType == wxT("wxGauge"))
{
// Check for default value
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
}
}
}
- else if (controlType == "wxSlider")
+ else if (controlType == wxT("wxSlider"))
{
// Check for default value
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
}
}
}
- else if (controlType == "wxScrollBar")
+ else if (controlType == wxT("wxScrollBar"))
{
// DEFAULT VALUE
if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
}
}
}
- else if (controlType == "wxListBox")
+ else if (controlType == wxT("wxListBox"))
{
wxExpr *valueList = (wxExpr *) NULL;
}
}
}
- else if (controlType == "wxChoice")
+ else if (controlType == wxT("wxChoice"))
{
wxExpr *valueList = (wxExpr *) NULL;
// Check for default value list
}
}
#if wxUSE_COMBOBOX
- else if (controlType == "wxComboBox")
+ else if (controlType == wxT("wxComboBox"))
{
wxExpr *textValue = expr->Nth(count);
if (textValue && (textValue->Type() == PrologString || textValue->Type() == PrologWord))
}
#endif
#if 1
- else if (controlType == "wxRadioBox")
+ else if (controlType == wxT("wxRadioBox"))
{
wxExpr *valueList = (wxExpr *) NULL;
// Check for default value list
if (expr->Number() == 0)
{
// item->SetType(wxRESOURCE_TYPE_SEPARATOR);
- item->SetType("wxMenuSeparator");
+ item->SetType(wxT("wxMenuSeparator"));
return item;
}
else
{
// item->SetType(wxTYPE_MENU); // Well, menu item, but doesn't matter.
- item->SetType("wxMenu"); // Well, menu item, but doesn't matter.
+ item->SetType(wxT("wxMenu")); // Well, menu item, but doesn't matter.
if (labelExpr)
{
wxString str(labelExpr->StringValue());
wxLogWarning(_("Could not resolve menu id '%s'. "
"Use (non-zero) integer instead\n"
"or provide #define (see manual for caveats)"),
- (const char*) idExpr->StringValue());
+ (const wxChar*) idExpr->StringValue());
}
}
else if (idExpr->Type() == PrologInteger)
wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr)
{
wxExpr *listExpr = (wxExpr *) NULL;
- expr->GetAttributeValue("menu", &listExpr);
+ expr->GetAttributeValue(wxT("menu"), &listExpr);
if (!listExpr)
return (wxItemResource *) NULL;
return (wxItemResource *) NULL;
wxString name;
- if (expr->GetAttributeValue("name", name))
+ if (expr->GetAttributeValue(wxT("name"), name))
{
menuResource->SetName(name);
}
wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)
{
wxExpr *listExpr = (wxExpr *) NULL;
- expr->GetAttributeValue("menu", &listExpr);
+ expr->GetAttributeValue(wxT("menu"), &listExpr);
if (!listExpr)
return (wxItemResource *) NULL;
wxItemResource *resource = new wxItemResource;
- resource->SetType("wxMenu");
+ resource->SetType(wxT("wxMenu"));
// resource->SetType(wxTYPE_MENU);
wxExpr *element = listExpr->GetFirst();
}
wxString name;
- if (expr->GetAttributeValue("name", name))
+ if (expr->GetAttributeValue(wxT("name"), name))
{
resource->SetName(name);
}
{
wxItemResource *bitmapItem = new wxItemResource;
// bitmapItem->SetType(wxTYPE_BITMAP);
- bitmapItem->SetType("wxBitmap");
+ bitmapItem->SetType(wxT("wxBitmap"));
wxString name;
- if (expr->GetAttributeValue("name", name))
+ if (expr->GetAttributeValue(wxT("name"), name))
{
bitmapItem->SetName(name);
}
if (bitmapExpr->Number() == 3)
{
wxString bitmapKeyword(bitmapExpr->Nth(1)->StringValue());
- if (bitmapKeyword == "bitmap" || bitmapKeyword == "icon")
+ if (bitmapKeyword == wxT("bitmap") || bitmapKeyword == wxT("icon"))
{
// The value part: always a list.
wxExpr *listExpr = bitmapExpr->Nth(2);
{
wxItemResource *bitmapSpec = new wxItemResource;
// bitmapSpec->SetType(wxTYPE_BITMAP);
- bitmapSpec->SetType("wxBitmap");
+ bitmapSpec->SetType(wxT("wxBitmap"));
// List is of form: [filename, bitmaptype, platform, colours, xresolution, yresolution]
// where everything after 'filename' is optional.
wxExpr *coloursExpr = listExpr->Nth(3);
wxExpr *xresExpr = listExpr->Nth(4);
wxExpr *yresExpr = listExpr->Nth(5);
- if (nameExpr && nameExpr->StringValue() != "")
+ if (nameExpr && nameExpr->StringValue() != wxT(""))
{
bitmapSpec->SetName(nameExpr->StringValue());
}
- if (typeExpr && typeExpr->StringValue() != "")
+ if (typeExpr && typeExpr->StringValue() != wxT(""))
{
bitmapSpec->SetValue1(wxParseWindowStyle(typeExpr->StringValue()));
}
else
bitmapSpec->SetValue1(0);
- if (platformExpr && platformExpr->StringValue() != "")
+ if (platformExpr && platformExpr->StringValue() != wxT(""))
{
wxString plat(platformExpr->StringValue());
- if (plat == "windows" || plat == "WINDOWS")
+ if (plat == wxT("windows") || plat == wxT("WINDOWS"))
bitmapSpec->SetValue2(RESOURCE_PLATFORM_WINDOWS);
- else if (plat == "x" || plat == "X")
+ else if (plat == wxT("x") || plat == wxT("X"))
bitmapSpec->SetValue2(RESOURCE_PLATFORM_X);
- else if (plat == "mac" || plat == "MAC")
+ else if (plat == wxT("mac") || plat == wxT("MAC"))
bitmapSpec->SetValue2(RESOURCE_PLATFORM_MAC);
else
bitmapSpec->SetValue2(RESOURCE_PLATFORM_ANY);
if (item)
{
// item->SetType(wxTYPE_ICON);
- item->SetType("wxIcon");
+ item->SetType(wxT("wxIcon"));
return item;
}
else
int style = wxNORMAL;
int weight = wxNORMAL;
int underline = 0;
- wxString faceName("");
+ wxString faceName(wxT(""));
wxExpr *pointExpr = expr->Nth(0);
wxExpr *familyExpr = expr->Nth(1);
static bool wxEatWhiteSpace(FILE *fd)
{
- int ch = getc(fd);
- if ((ch != ' ') && (ch != '/') && (ch != ' ') && (ch != 10) && (ch != 13) && (ch != 9))
- {
- ungetc(ch, fd);
- return TRUE;
- }
+ int ch = 0;
- // Eat whitespace
- while (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
- ch = getc(fd);
- // Check for comment
- if (ch == '/')
- {
- ch = getc(fd);
- if (ch == '*')
- {
- bool finished = FALSE;
- while (!finished)
+ while ((ch = getc(fd)) != EOF)
{
- ch = getc(fd);
- if (ch == EOF)
- return FALSE;
- if (ch == '*')
- {
- int newCh = getc(fd);
- if (newCh == '/')
- finished = TRUE;
- else
- {
- ungetc(newCh, fd);
- }
- }
+ switch (ch)
+ {
+ case ' ':
+ case 0x0a:
+ case 0x0d:
+ case 0x09:
+ break;
+ case '/':
+ {
+ int prev_ch = ch;
+ ch = getc(fd);
+ if (ch == EOF)
+ {
+ ungetc(prev_ch, fd);
+ return TRUE;
+ }
+
+ if (ch == '*')
+ {
+ // Eat C comment
+ prev_ch = 0;
+ while ((ch = getc(fd)) != EOF)
+ {
+ if (ch == '/' && prev_ch == '*')
+ break;
+ prev_ch = ch;
+ }
+ }
+ else if (ch == '/')
+ {
+ // Eat C++ comment
+ static char buffer[255];
+ fgets(buffer, 255, fd);
+ }
+ else
+ {
+ ungetc(prev_ch, fd);
+ ungetc(ch, fd);
+ return TRUE;
+ }
+ }
+ break;
+ default:
+ ungetc(ch, fd);
+ return TRUE;
+
+ }
}
- }
- else // False alarm
- return FALSE;
- }
- else
- ungetc(ch, fd);
- return wxEatWhiteSpace(fd);
+ return FALSE;
}
bool wxGetResourceToken(FILE *fd)
if (strcmp(wxResourceBuffer, "#define") == 0)
{
wxGetResourceToken(fd);
- char *name = copystring(wxResourceBuffer);
+ wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
wxGetResourceToken(fd);
- char *value = copystring(wxResourceBuffer);
- if (isalpha(value[0]))
+ wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
+ if (wxIsdigit(value[0]))
{
- int val = (int)atol(value);
+ int val = (int)wxAtol(value);
wxResourceAddIdentifier(name, val, table);
}
else
else if (strcmp(wxResourceBuffer, "#include") == 0)
{
wxGetResourceToken(fd);
- char *name = copystring(wxResourceBuffer);
- char *actualName = name;
- if (name[0] == '"')
+ wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
+ wxChar *actualName = name;
+ if (name[0] == wxT('"'))
actualName = name + 1;
- int len = strlen(name);
- if ((len > 0) && (name[len-1] == '"'))
+ int len = wxStrlen(name);
+ if ((len > 0) && (name[len-1] == wxT('"')))
name[len-1] = 0;
if (!wxResourceParseIncludeFile(actualName, table))
{
}
else if (strcmp(wxResourceBuffer, "static") != 0)
{
- char buf[300];
- strcpy(buf, _("Found "));
- strncat(buf, wxResourceBuffer, 30);
- strcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+ wxChar buf[300];
+ wxStrcpy(buf, _("Found "));
+ wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
+ wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
wxLogWarning(buf);
return FALSE;
}
wxLogWarning(_("Expected '*' whilst parsing resource."));
return FALSE;
}
- char nameBuf[100];
- strncpy(nameBuf, wxResourceBuffer+1, 99);
+ wxChar nameBuf[100];
+ wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
+ nameBuf[99] = 0;
// =
if (!wxGetResourceToken(fd))
* "wxSYSTEM_MENU | wxBORDER" -> integer
*/
-char* wxResourceParseWord(char*s, int *i)
+wxChar* wxResourceParseWord(wxChar*s, int *i)
{
if (!s)
- return (char*) NULL;
+ return (wxChar*) NULL;
- static char buf[150];
- int len = strlen(s);
+ static wxChar buf[150];
+ int len = wxStrlen(s);
int j = 0;
int ii = *i;
- while ((ii < len) && (isalpha(s[ii]) || (s[ii] == '_')))
+ while ((ii < len) && (wxIsalpha(s[ii]) || (s[ii] == wxT('_'))))
{
buf[j] = s[ii];
j ++;
// Eat whitespace and conjunction characters
while ((ii < len) &&
- ((s[ii] == ' ') || (s[ii] == '|') || (s[ii] == ',')))
+ ((s[ii] == wxT(' ')) || (s[ii] == wxT('|')) || (s[ii] == wxT(','))))
{
ii ++;
}
*i = ii;
if (j == 0)
- return (char*) NULL;
+ return (wxChar*) NULL;
else
return buf;
}
struct wxResourceBitListStruct
{
- char *word;
+ wxChar *word;
long bits;
};
static wxResourceBitListStruct wxResourceBitListTable[] =
{
/* wxListBox */
- { "wxSINGLE", wxLB_SINGLE },
- { "wxMULTIPLE", wxLB_MULTIPLE },
- { "wxEXTENDED", wxLB_EXTENDED },
- { "wxLB_SINGLE", wxLB_SINGLE },
- { "wxLB_MULTIPLE", wxLB_MULTIPLE },
- { "wxLB_EXTENDED", wxLB_EXTENDED },
- { "wxLB_NEEDED_SB", wxLB_NEEDED_SB },
- { "wxLB_ALWAYS_SB", wxLB_ALWAYS_SB },
- { "wxLB_SORT", wxLB_SORT },
- { "wxLB_OWNERDRAW", wxLB_OWNERDRAW },
- { "wxLB_HSCROLL", wxLB_HSCROLL },
+ { wxT("wxSINGLE"), wxLB_SINGLE },
+ { wxT("wxMULTIPLE"), wxLB_MULTIPLE },
+ { wxT("wxEXTENDED"), wxLB_EXTENDED },
+ { wxT("wxLB_SINGLE"), wxLB_SINGLE },
+ { wxT("wxLB_MULTIPLE"), wxLB_MULTIPLE },
+ { wxT("wxLB_EXTENDED"), wxLB_EXTENDED },
+ { wxT("wxLB_NEEDED_SB"), wxLB_NEEDED_SB },
+ { wxT("wxLB_ALWAYS_SB"), wxLB_ALWAYS_SB },
+ { wxT("wxLB_SORT"), wxLB_SORT },
+ { wxT("wxLB_OWNERDRAW"), wxLB_OWNERDRAW },
+ { wxT("wxLB_HSCROLL"), wxLB_HSCROLL },
/* wxComboxBox */
- { "wxCB_SIMPLE", wxCB_SIMPLE },
- { "wxCB_DROPDOWN", wxCB_DROPDOWN },
- { "wxCB_READONLY", wxCB_READONLY },
- { "wxCB_SORT", wxCB_SORT },
+ { wxT("wxCB_SIMPLE"), wxCB_SIMPLE },
+ { wxT("wxCB_DROPDOWN"), wxCB_DROPDOWN },
+ { wxT("wxCB_READONLY"), wxCB_READONLY },
+ { wxT("wxCB_SORT"), wxCB_SORT },
/* wxGauge */
- { "wxGA_PROGRESSBAR", wxGA_PROGRESSBAR },
- { "wxGA_HORIZONTAL", wxGA_HORIZONTAL },
- { "wxGA_VERTICAL", wxGA_VERTICAL },
+ { wxT("wxGA_PROGRESSBAR"), wxGA_PROGRESSBAR },
+ { wxT("wxGA_HORIZONTAL"), wxGA_HORIZONTAL },
+ { wxT("wxGA_VERTICAL"), wxGA_VERTICAL },
/* wxTextCtrl */
- { "wxPASSWORD", wxPASSWORD},
- { "wxPROCESS_ENTER", wxPROCESS_ENTER},
- { "wxTE_PASSWORD", wxTE_PASSWORD},
- { "wxTE_READONLY", wxTE_READONLY},
- { "wxTE_PROCESS_ENTER", wxTE_PROCESS_ENTER},
- { "wxTE_MULTILINE", wxTE_MULTILINE},
+ { wxT("wxPASSWORD"), wxPASSWORD},
+ { wxT("wxPROCESS_ENTER"), wxPROCESS_ENTER},
+ { wxT("wxTE_PASSWORD"), wxTE_PASSWORD},
+ { wxT("wxTE_READONLY"), wxTE_READONLY},
+ { wxT("wxTE_PROCESS_ENTER"), wxTE_PROCESS_ENTER},
+ { wxT("wxTE_MULTILINE"), wxTE_MULTILINE},
+ { wxT("wxTE_NO_VSCROLL"), wxTE_NO_VSCROLL},
/* wxRadioBox/wxRadioButton */
- { "wxRB_GROUP", wxRB_GROUP },
- { "wxRA_SPECIFY_COLS", wxRA_SPECIFY_COLS },
- { "wxRA_SPECIFY_ROWS", wxRA_SPECIFY_ROWS },
- { "wxRA_HORIZONTAL", wxRA_HORIZONTAL },
- { "wxRA_VERTICAL", wxRA_VERTICAL },
+ { wxT("wxRB_GROUP"), wxRB_GROUP },
+ { wxT("wxRA_SPECIFY_COLS"), wxRA_SPECIFY_COLS },
+ { wxT("wxRA_SPECIFY_ROWS"), wxRA_SPECIFY_ROWS },
+ { wxT("wxRA_HORIZONTAL"), wxRA_HORIZONTAL },
+ { wxT("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 },
+ { wxT("wxSL_HORIZONTAL"), wxSL_HORIZONTAL },
+ { wxT("wxSL_VERTICAL"), wxSL_VERTICAL },
+ { wxT("wxSL_AUTOTICKS"), wxSL_AUTOTICKS },
+ { wxT("wxSL_LABELS"), wxSL_LABELS },
+ { wxT("wxSL_LEFT"), wxSL_LEFT },
+ { wxT("wxSL_TOP"), wxSL_TOP },
+ { wxT("wxSL_RIGHT"), wxSL_RIGHT },
+ { wxT("wxSL_BOTTOM"), wxSL_BOTTOM },
+ { wxT("wxSL_BOTH"), wxSL_BOTH },
+ { wxT("wxSL_SELRANGE"), wxSL_SELRANGE },
/* wxScrollBar */
- { "wxSB_HORIZONTAL", wxSB_HORIZONTAL },
- { "wxSB_VERTICAL", wxSB_VERTICAL },
+ { wxT("wxSB_HORIZONTAL"), wxSB_HORIZONTAL },
+ { wxT("wxSB_VERTICAL"), wxSB_VERTICAL },
/* wxButton */
- { "wxBU_AUTODRAW", wxBU_AUTODRAW },
- { "wxBU_NOAUTODRAW", wxBU_NOAUTODRAW },
+ { wxT("wxBU_AUTODRAW"), wxBU_AUTODRAW },
+ { wxT("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 },
+ { wxT("wxTR_HAS_BUTTONS"), wxTR_HAS_BUTTONS },
+ { wxT("wxTR_EDIT_LABELS"), wxTR_EDIT_LABELS },
+ { wxT("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 },
+ { wxT("wxLC_ICON"), wxLC_ICON },
+ { wxT("wxLC_SMALL_ICON"), wxLC_SMALL_ICON },
+ { wxT("wxLC_LIST"), wxLC_LIST },
+ { wxT("wxLC_REPORT"), wxLC_REPORT },
+ { wxT("wxLC_ALIGN_TOP"), wxLC_ALIGN_TOP },
+ { wxT("wxLC_ALIGN_LEFT"), wxLC_ALIGN_LEFT },
+ { wxT("wxLC_AUTOARRANGE"), wxLC_AUTOARRANGE },
+ { wxT("wxLC_USER_TEXT"), wxLC_USER_TEXT },
+ { wxT("wxLC_EDIT_LABELS"), wxLC_EDIT_LABELS },
+ { wxT("wxLC_NO_HEADER"), wxLC_NO_HEADER },
+ { wxT("wxLC_NO_SORT_HEADER"), wxLC_NO_SORT_HEADER },
+ { wxT("wxLC_SINGLE_SEL"), wxLC_SINGLE_SEL },
+ { wxT("wxLC_SORT_ASCENDING"), wxLC_SORT_ASCENDING },
+ { wxT("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},
+ { wxT("wxSP_VERTICAL"), wxSP_VERTICAL},
+ { wxT("wxSP_HORIZONTAL"), wxSP_HORIZONTAL},
+ { wxT("wxSP_ARROW_KEYS"), wxSP_ARROW_KEYS},
+ { wxT("wxSP_WRAP"), wxSP_WRAP},
/* wxSplitterWnd */
- { "wxSP_NOBORDER", wxSP_NOBORDER},
- { "wxSP_3D", wxSP_3D},
- { "wxSP_BORDER", wxSP_BORDER},
+ { wxT("wxSP_NOBORDER"), wxSP_NOBORDER},
+ { wxT("wxSP_3D"), wxSP_3D},
+ { wxT("wxSP_BORDER"), wxSP_BORDER},
/* wxTabCtrl */
- { "wxTC_MULTILINE", wxTC_MULTILINE},
- { "wxTC_RIGHTJUSTIFY", wxTC_RIGHTJUSTIFY},
- { "wxTC_FIXEDWIDTH", wxTC_FIXEDWIDTH},
- { "wxTC_OWNERDRAW", wxTC_OWNERDRAW},
+ { wxT("wxTC_MULTILINE"), wxTC_MULTILINE},
+ { wxT("wxTC_RIGHTJUSTIFY"), wxTC_RIGHTJUSTIFY},
+ { wxT("wxTC_FIXEDWIDTH"), wxTC_FIXEDWIDTH},
+ { wxT("wxTC_OWNERDRAW"), wxTC_OWNERDRAW},
/* wxStatusBar95 */
- { "wxST_SIZEGRIP", wxST_SIZEGRIP},
+ { wxT("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},
+ { wxT("wxFIXED_LENGTH"), wxFIXED_LENGTH},
+ { wxT("wxALIGN_LEFT"), wxALIGN_LEFT},
+ { wxT("wxALIGN_CENTER"), wxALIGN_CENTER},
+ { wxT("wxALIGN_CENTRE"), wxALIGN_CENTRE},
+ { wxT("wxALIGN_RIGHT"), wxALIGN_RIGHT},
+ { wxT("wxCOLOURED"), wxCOLOURED},
/* wxToolBar */
- { "wxTB_3DBUTTONS", wxTB_3DBUTTONS},
- { "wxTB_HORIZONTAL", wxTB_HORIZONTAL},
- { "wxTB_VERTICAL", wxTB_VERTICAL},
- { "wxTB_FLAT", wxTB_FLAT},
+ { wxT("wxTB_3DBUTTONS"), wxTB_3DBUTTONS},
+ { wxT("wxTB_HORIZONTAL"), wxTB_HORIZONTAL},
+ { wxT("wxTB_VERTICAL"), wxTB_VERTICAL},
+ { wxT("wxTB_FLAT"), wxTB_FLAT},
+
+ /* wxDialog */
+ { wxT("wxDIALOG_MODAL"), wxDIALOG_MODAL },
/* Generic */
- { "wxVSCROLL", wxVSCROLL },
- { "wxHSCROLL", wxHSCROLL },
- { "wxCAPTION", wxCAPTION },
- { "wxSTAY_ON_TOP", wxSTAY_ON_TOP},
- { "wxICONIZE", wxICONIZE},
- { "wxMINIMIZE", wxICONIZE},
- { "wxMAXIMIZE", wxMAXIMIZE},
- { "wxSDI", 0},
- { "wxMDI_PARENT", 0},
- { "wxMDI_CHILD", 0},
- { "wxTHICK_FRAME", wxTHICK_FRAME},
- { "wxRESIZE_BORDER", wxRESIZE_BORDER},
- { "wxSYSTEM_MENU", wxSYSTEM_MENU},
- { "wxMINIMIZE_BOX", wxMINIMIZE_BOX},
- { "wxMAXIMIZE_BOX", wxMAXIMIZE_BOX},
- { "wxRESIZE_BOX", wxRESIZE_BOX},
- { "wxDEFAULT_FRAME_STYLE", wxDEFAULT_FRAME_STYLE},
- { "wxDEFAULT_FRAME", wxDEFAULT_FRAME_STYLE},
- { "wxDEFAULT_DIALOG_STYLE", wxDEFAULT_DIALOG_STYLE},
- { "wxBORDER", wxBORDER},
- { "wxRETAINED", wxRETAINED},
- { "wxNATIVE_IMPL", 0},
- { "wxEXTENDED_IMPL", 0},
- { "wxBACKINGSTORE", wxBACKINGSTORE},
-// { "wxFLAT", wxFLAT},
-// { "wxMOTIF_RESIZE", wxMOTIF_RESIZE},
- { "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},
-
- { "wxTINY_CAPTION_HORIZ", wxTINY_CAPTION_HORIZ},
- { "wxTINY_CAPTION_VERT", wxTINY_CAPTION_VERT},
+ { wxT("wxVSCROLL"), wxVSCROLL },
+ { wxT("wxHSCROLL"), wxHSCROLL },
+ { wxT("wxCAPTION"), wxCAPTION },
+ { wxT("wxSTAY_ON_TOP"), wxSTAY_ON_TOP},
+ { wxT("wxICONIZE"), wxICONIZE},
+ { wxT("wxMINIMIZE"), wxICONIZE},
+ { wxT("wxMAXIMIZE"), wxMAXIMIZE},
+ { wxT("wxSDI"), 0},
+ { wxT("wxMDI_PARENT"), 0},
+ { wxT("wxMDI_CHILD"), 0},
+ { wxT("wxTHICK_FRAME"), wxTHICK_FRAME},
+ { wxT("wxRESIZE_BORDER"), wxRESIZE_BORDER},
+ { wxT("wxSYSTEM_MENU"), wxSYSTEM_MENU},
+ { wxT("wxMINIMIZE_BOX"), wxMINIMIZE_BOX},
+ { wxT("wxMAXIMIZE_BOX"), wxMAXIMIZE_BOX},
+ { wxT("wxRESIZE_BOX"), wxRESIZE_BOX},
+ { wxT("wxDEFAULT_FRAME_STYLE"), wxDEFAULT_FRAME_STYLE},
+ { wxT("wxDEFAULT_FRAME"), wxDEFAULT_FRAME_STYLE},
+ { wxT("wxDEFAULT_DIALOG_STYLE"), wxDEFAULT_DIALOG_STYLE},
+ { wxT("wxBORDER"), wxBORDER},
+ { wxT("wxRETAINED"), wxRETAINED},
+ { wxT("wxNATIVE_IMPL"), 0},
+ { wxT("wxEXTENDED_IMPL"), 0},
+ { wxT("wxBACKINGSTORE"), wxBACKINGSTORE},
+// { wxT("wxFLAT"), wxFLAT},
+// { wxT("wxMOTIF_RESIZE"), wxMOTIF_RESIZE},
+ { wxT("wxFIXED_LENGTH"), 0},
+ { wxT("wxDOUBLE_BORDER"), wxDOUBLE_BORDER},
+ { wxT("wxSUNKEN_BORDER"), wxSUNKEN_BORDER},
+ { wxT("wxRAISED_BORDER"), wxRAISED_BORDER},
+ { wxT("wxSIMPLE_BORDER"), wxSIMPLE_BORDER},
+ { wxT("wxSTATIC_BORDER"), wxSTATIC_BORDER},
+ { wxT("wxTRANSPARENT_WINDOW"), wxTRANSPARENT_WINDOW},
+ { wxT("wxNO_BORDER"), wxNO_BORDER},
+ { wxT("wxCLIP_CHILDREN"), wxCLIP_CHILDREN},
+ { wxT("wxTAB_TRAVERSAL"), 0}, // Compatibility only
+
+ { wxT("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},
+ { wxT("wxTINY_CAPTION_VERT"), wxTINY_CAPTION_VERT},
// Text font families
- { "wxDEFAULT", wxDEFAULT},
- { "wxDECORATIVE", wxDECORATIVE},
- { "wxROMAN", wxROMAN},
- { "wxSCRIPT", wxSCRIPT},
- { "wxSWISS", wxSWISS},
- { "wxMODERN", wxMODERN},
- { "wxTELETYPE", wxTELETYPE},
- { "wxVARIABLE", wxVARIABLE},
- { "wxFIXED", wxFIXED},
- { "wxNORMAL", wxNORMAL},
- { "wxLIGHT", wxLIGHT},
- { "wxBOLD", wxBOLD},
- { "wxITALIC", wxITALIC},
- { "wxSLANT", wxSLANT},
- { "wxSOLID", wxSOLID},
- { "wxDOT", wxDOT},
- { "wxLONG_DASH", wxLONG_DASH},
- { "wxSHORT_DASH", wxSHORT_DASH},
- { "wxDOT_DASH", wxDOT_DASH},
- { "wxUSER_DASH", wxUSER_DASH},
- { "wxTRANSPARENT", wxTRANSPARENT},
- { "wxSTIPPLE", wxSTIPPLE},
- { "wxBDIAGONAL_HATCH", wxBDIAGONAL_HATCH},
- { "wxCROSSDIAG_HATCH", wxCROSSDIAG_HATCH},
- { "wxFDIAGONAL_HATCH", wxFDIAGONAL_HATCH},
- { "wxCROSS_HATCH", wxCROSS_HATCH},
- { "wxHORIZONTAL_HATCH", wxHORIZONTAL_HATCH},
- { "wxVERTICAL_HATCH", wxVERTICAL_HATCH},
- { "wxJOIN_BEVEL", wxJOIN_BEVEL},
- { "wxJOIN_MITER", wxJOIN_MITER},
- { "wxJOIN_ROUND", wxJOIN_ROUND},
- { "wxCAP_ROUND", wxCAP_ROUND},
- { "wxCAP_PROJECTING", wxCAP_PROJECTING},
- { "wxCAP_BUTT", wxCAP_BUTT},
+ { wxT("wxDEFAULT"), wxDEFAULT},
+ { wxT("wxDECORATIVE"), wxDECORATIVE},
+ { wxT("wxROMAN"), wxROMAN},
+ { wxT("wxSCRIPT"), wxSCRIPT},
+ { wxT("wxSWISS"), wxSWISS},
+ { wxT("wxMODERN"), wxMODERN},
+ { wxT("wxTELETYPE"), wxTELETYPE},
+ { wxT("wxVARIABLE"), wxVARIABLE},
+ { wxT("wxFIXED"), wxFIXED},
+ { wxT("wxNORMAL"), wxNORMAL},
+ { wxT("wxLIGHT"), wxLIGHT},
+ { wxT("wxBOLD"), wxBOLD},
+ { wxT("wxITALIC"), wxITALIC},
+ { wxT("wxSLANT"), wxSLANT},
+ { wxT("wxSOLID"), wxSOLID},
+ { wxT("wxDOT"), wxDOT},
+ { wxT("wxLONG_DASH"), wxLONG_DASH},
+ { wxT("wxSHORT_DASH"), wxSHORT_DASH},
+ { wxT("wxDOT_DASH"), wxDOT_DASH},
+ { wxT("wxUSER_DASH"), wxUSER_DASH},
+ { wxT("wxTRANSPARENT"), wxTRANSPARENT},
+ { wxT("wxSTIPPLE"), wxSTIPPLE},
+ { wxT("wxBDIAGONAL_HATCH"), wxBDIAGONAL_HATCH},
+ { wxT("wxCROSSDIAG_HATCH"), wxCROSSDIAG_HATCH},
+ { wxT("wxFDIAGONAL_HATCH"), wxFDIAGONAL_HATCH},
+ { wxT("wxCROSS_HATCH"), wxCROSS_HATCH},
+ { wxT("wxHORIZONTAL_HATCH"), wxHORIZONTAL_HATCH},
+ { wxT("wxVERTICAL_HATCH"), wxVERTICAL_HATCH},
+ { wxT("wxJOIN_BEVEL"), wxJOIN_BEVEL},
+ { wxT("wxJOIN_MITER"), wxJOIN_MITER},
+ { wxT("wxJOIN_ROUND"), wxJOIN_ROUND},
+ { wxT("wxCAP_ROUND"), wxCAP_ROUND},
+ { wxT("wxCAP_PROJECTING"), wxCAP_PROJECTING},
+ { wxT("wxCAP_BUTT"), wxCAP_BUTT},
// Logical ops
- { "wxCLEAR", wxCLEAR},
- { "wxXOR", wxXOR},
- { "wxINVERT", wxINVERT},
- { "wxOR_REVERSE", wxOR_REVERSE},
- { "wxAND_REVERSE", wxAND_REVERSE},
- { "wxCOPY", wxCOPY},
- { "wxAND", wxAND},
- { "wxAND_INVERT", wxAND_INVERT},
- { "wxNO_OP", wxNO_OP},
- { "wxNOR", wxNOR},
- { "wxEQUIV", wxEQUIV},
- { "wxSRC_INVERT", wxSRC_INVERT},
- { "wxOR_INVERT", wxOR_INVERT},
- { "wxNAND", wxNAND},
- { "wxOR", wxOR},
- { "wxSET", wxSET},
-
- { "wxFLOOD_SURFACE", wxFLOOD_SURFACE},
- { "wxFLOOD_BORDER", wxFLOOD_BORDER},
- { "wxODDEVEN_RULE", wxODDEVEN_RULE},
- { "wxWINDING_RULE", wxWINDING_RULE},
- { "wxHORIZONTAL", wxHORIZONTAL},
- { "wxVERTICAL", wxVERTICAL},
- { "wxBOTH", wxBOTH},
- { "wxCENTER_FRAME", wxCENTER_FRAME},
- { "wxOK", wxOK},
- { "wxYES_NO", wxYES_NO},
- { "wxCANCEL", wxCANCEL},
- { "wxYES", wxYES},
- { "wxNO", wxNO},
- { "wxICON_EXCLAMATION", wxICON_EXCLAMATION},
- { "wxICON_HAND", wxICON_HAND},
- { "wxICON_QUESTION", wxICON_QUESTION},
- { "wxICON_INFORMATION", wxICON_INFORMATION},
- { "wxICON_STOP", wxICON_STOP},
- { "wxICON_ASTERISK", wxICON_ASTERISK},
- { "wxICON_MASK", wxICON_MASK},
- { "wxCENTRE", wxCENTRE},
- { "wxCENTER", wxCENTRE},
- { "wxUSER_COLOURS", wxUSER_COLOURS},
- { "wxVERTICAL_LABEL", 0},
- { "wxHORIZONTAL_LABEL", 0},
+ { wxT("wxCLEAR"), wxCLEAR},
+ { wxT("wxXOR"), wxXOR},
+ { wxT("wxINVERT"), wxINVERT},
+ { wxT("wxOR_REVERSE"), wxOR_REVERSE},
+ { wxT("wxAND_REVERSE"), wxAND_REVERSE},
+ { wxT("wxCOPY"), wxCOPY},
+ { wxT("wxAND"), wxAND},
+ { wxT("wxAND_INVERT"), wxAND_INVERT},
+ { wxT("wxNO_OP"), wxNO_OP},
+ { wxT("wxNOR"), wxNOR},
+ { wxT("wxEQUIV"), wxEQUIV},
+ { wxT("wxSRC_INVERT"), wxSRC_INVERT},
+ { wxT("wxOR_INVERT"), wxOR_INVERT},
+ { wxT("wxNAND"), wxNAND},
+ { wxT("wxOR"), wxOR},
+ { wxT("wxSET"), wxSET},
+
+ { wxT("wxFLOOD_SURFACE"), wxFLOOD_SURFACE},
+ { wxT("wxFLOOD_BORDER"), wxFLOOD_BORDER},
+ { wxT("wxODDEVEN_RULE"), wxODDEVEN_RULE},
+ { wxT("wxWINDING_RULE"), wxWINDING_RULE},
+ { wxT("wxHORIZONTAL"), wxHORIZONTAL},
+ { wxT("wxVERTICAL"), wxVERTICAL},
+ { wxT("wxBOTH"), wxBOTH},
+ { wxT("wxCENTER_FRAME"), wxCENTER_FRAME},
+ { wxT("wxOK"), wxOK},
+ { wxT("wxYES_NO"), wxYES_NO},
+ { wxT("wxCANCEL"), wxCANCEL},
+ { wxT("wxYES"), wxYES},
+ { wxT("wxNO"), wxNO},
+ { wxT("wxICON_EXCLAMATION"), wxICON_EXCLAMATION},
+ { wxT("wxICON_HAND"), wxICON_HAND},
+ { wxT("wxICON_QUESTION"), wxICON_QUESTION},
+ { wxT("wxICON_INFORMATION"), wxICON_INFORMATION},
+ { wxT("wxICON_STOP"), wxICON_STOP},
+ { wxT("wxICON_ASTERISK"), wxICON_ASTERISK},
+ { wxT("wxICON_MASK"), wxICON_MASK},
+ { wxT("wxCENTRE"), wxCENTRE},
+ { wxT("wxCENTER"), wxCENTRE},
+ { wxT("wxUSER_COLOURS"), wxUSER_COLOURS},
+ { wxT("wxVERTICAL_LABEL"), 0},
+ { wxT("wxHORIZONTAL_LABEL"), 0},
// Bitmap types (not strictly styles)
- { "wxBITMAP_TYPE_XPM", wxBITMAP_TYPE_XPM},
- { "wxBITMAP_TYPE_XBM", wxBITMAP_TYPE_XBM},
- { "wxBITMAP_TYPE_BMP", wxBITMAP_TYPE_BMP},
- { "wxBITMAP_TYPE_RESOURCE", wxBITMAP_TYPE_BMP_RESOURCE},
- { "wxBITMAP_TYPE_BMP_RESOURCE", wxBITMAP_TYPE_BMP_RESOURCE},
- { "wxBITMAP_TYPE_GIF", wxBITMAP_TYPE_GIF},
- { "wxBITMAP_TYPE_TIF", wxBITMAP_TYPE_TIF},
- { "wxBITMAP_TYPE_ICO", wxBITMAP_TYPE_ICO},
- { "wxBITMAP_TYPE_ICO_RESOURCE", wxBITMAP_TYPE_ICO_RESOURCE},
- { "wxBITMAP_TYPE_CUR", wxBITMAP_TYPE_CUR},
- { "wxBITMAP_TYPE_CUR_RESOURCE", wxBITMAP_TYPE_CUR_RESOURCE},
- { "wxBITMAP_TYPE_XBM_DATA", wxBITMAP_TYPE_XBM_DATA},
- { "wxBITMAP_TYPE_XPM_DATA", wxBITMAP_TYPE_XPM_DATA},
- { "wxBITMAP_TYPE_ANY", wxBITMAP_TYPE_ANY}
+ { wxT("wxBITMAP_TYPE_XPM"), wxBITMAP_TYPE_XPM},
+ { wxT("wxBITMAP_TYPE_XBM"), wxBITMAP_TYPE_XBM},
+ { wxT("wxBITMAP_TYPE_BMP"), wxBITMAP_TYPE_BMP},
+ { wxT("wxBITMAP_TYPE_RESOURCE"), wxBITMAP_TYPE_BMP_RESOURCE},
+ { wxT("wxBITMAP_TYPE_BMP_RESOURCE"), wxBITMAP_TYPE_BMP_RESOURCE},
+ { wxT("wxBITMAP_TYPE_GIF"), wxBITMAP_TYPE_GIF},
+ { wxT("wxBITMAP_TYPE_TIF"), wxBITMAP_TYPE_TIF},
+ { wxT("wxBITMAP_TYPE_ICO"), wxBITMAP_TYPE_ICO},
+ { wxT("wxBITMAP_TYPE_ICO_RESOURCE"), wxBITMAP_TYPE_ICO_RESOURCE},
+ { wxT("wxBITMAP_TYPE_CUR"), wxBITMAP_TYPE_CUR},
+ { wxT("wxBITMAP_TYPE_CUR_RESOURCE"), wxBITMAP_TYPE_CUR_RESOURCE},
+ { wxT("wxBITMAP_TYPE_XBM_DATA"), wxBITMAP_TYPE_XBM_DATA},
+ { wxT("wxBITMAP_TYPE_XPM_DATA"), wxBITMAP_TYPE_XPM_DATA},
+ { wxT("wxBITMAP_TYPE_ANY"), wxBITMAP_TYPE_ANY}
};
static int wxResourceBitListCount = (sizeof(wxResourceBitListTable)/sizeof(wxResourceBitListStruct));
long wxParseWindowStyle(const wxString& bitListString)
{
int i = 0;
- char *word;
+ wxChar *word;
long bitList = 0;
- while ((word = wxResourceParseWord((char*) (const char*) bitListString, &i)))
+ word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
+ while (word != NULL)
{
bool found = FALSE;
int j;
for (j = 0; j < wxResourceBitListCount; j++)
- if (strcmp(wxResourceBitListTable[j].word, word) == 0)
+ if (wxStrcmp(wxResourceBitListTable[j].word, word) == 0)
{
bitList |= wxResourceBitListTable[j].bits;
found = TRUE;
wxLogWarning(_("Unrecognized style %s whilst parsing resource."), word);
return 0;
}
+ word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
}
return bitList;
}
wxItemResource *item = table->FindResource(resource);
if (item)
{
- if ((item->GetType() == "") || (item->GetType() != "wxBitmap"))
+ if ((item->GetType() == wxT("")) || (item->GetType() != wxT("wxBitmap")))
{
- wxLogWarning(_("%s not a bitmap resource specification."), (const char*) resource);
+ wxLogWarning(_("%s not a bitmap resource specification."), (const wxChar*) resource);
return wxNullBitmap;
}
int thisDepth = wxDisplayDepth();
if (!item)
{
wxLogWarning(_("Failed to find XBM resource %s.\n"
- "Forgot to use wxResourceLoadBitmapData?"), (const char*) name);
+ "Forgot to use wxResourceLoadBitmapData?"), (const wxChar*) name);
return wxNullBitmap;
}
return wxBitmap(item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()) ;
#else
wxLogWarning(_("No XBM facility available!"));
-#endif
break;
+#endif
}
case wxBITMAP_TYPE_XPM_DATA:
{
if (!item)
{
wxLogWarning(_("Failed to find XPM resource %s.\n"
- "Forgot to use wxResourceLoadBitmapData?"), (const char*) name);
+ "Forgot to use wxResourceLoadBitmapData?"), (const wxChar*) name);
return wxNullBitmap;
}
return wxBitmap((char **)item->GetValue1());
#else
wxLogWarning(_("No XPM facility available!"));
-#endif
break;
+#endif
}
default:
{
return wxBitmap(name, bitmapType);
- break;
}
}
return wxNullBitmap;
}
else
{
- wxLogWarning(_("Bitmap resource specification %s not found."), (const char*) resource);
+ wxLogWarning(_("Bitmap resource specification %s not found."), (const wxChar*) resource);
return wxNullBitmap;
}
}
wxItemResource *item = table->FindResource(resource);
if (item)
{
- if ((item->GetType() == "") || strcmp(item->GetType(), "wxIcon") != 0)
+ if ((item->GetType() == wxT("")) || wxStrcmp(item->GetType(), wxT("wxIcon")) != 0)
{
- wxLogWarning(_("%s not an icon resource specification."), (const char*) resource);
+ wxLogWarning(_("%s not an icon resource specification."), (const wxChar*) resource);
return wxNullIcon;
}
int thisDepth = wxDisplayDepth();
if (!item)
{
wxLogWarning(_("Failed to find XBM resource %s.\n"
- "Forgot to use wxResourceLoadIconData?"), (const char*) name);
+ "Forgot to use wxResourceLoadIconData?"), (const wxChar*) name);
return wxNullIcon;
}
return wxIcon((const char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
#else
wxLogWarning(_("No XBM facility available!"));
-#endif
break;
+#endif
}
case wxBITMAP_TYPE_XPM_DATA:
{
default:
{
#ifdef __WXGTK__
- wxLogWarning(_("Icon resource specification %s not found."), (const char*) resource);
+ wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
#else
return wxIcon(name, bitmapType);
#endif
}
else
{
- wxLogWarning(_("Icon resource specification %s not found."), (const char*) resource);
+ wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
return wxNullIcon;
}
}
while (node)
{
wxItemResource *child = (wxItemResource *)node->Data();
- if ((child->GetType() != "") && (child->GetType() == "wxMenuSeparator"))
+ if ((child->GetType() != wxT("")) && (child->GetType() == wxT("wxMenuSeparator")))
menu->AppendSeparator();
else if (child->GetChildren().Number() > 0)
{
table = wxDefaultResourceTable;
wxItemResource *menuResource = table->FindResource(resource);
- if (menuResource && (menuResource->GetType() != "") && (menuResource->GetType() == "wxMenu"))
+ if (menuResource && (menuResource->GetType() != wxT("")) && (menuResource->GetType() == wxT("wxMenu")))
{
if (!menuBar)
menuBar = new wxMenuBar;
table = wxDefaultResourceTable;
wxItemResource *menuResource = table->FindResource(resource);
- if (menuResource && (menuResource->GetType() != "") && (menuResource->GetType() == "wxMenu"))
+ if (menuResource && (menuResource->GetType() != wxT("")) && (menuResource->GetType() == wxT("wxMenu")))
// if (menuResource && (menuResource->GetType() == wxTYPE_MENU))
return wxResourceCreateMenu(menuResource);
return (wxMenu *) NULL;
if (!table)
table = wxDefaultResourceTable;
- table->identifiers.Put(name, (wxObject *)value);
+ table->identifiers.Put(name, (wxObject *)(long)value);
return TRUE;
}
if (!table)
table = wxDefaultResourceTable;
- return (int)table->identifiers.Get(name);
+ return (int)(long)table->identifiers.Get(name);
}
/*
if (!table)
table = wxDefaultResourceTable;
- FILE *fd = fopen(f, "r");
+ FILE *fd = fopen(f.fn_str(), "r");
if (!fd)
{
return FALSE;
if (strcmp(wxResourceBuffer, "#define") == 0)
{
wxGetResourceToken(fd);
- char *name = copystring(wxResourceBuffer);
+ wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
wxGetResourceToken(fd);
- char *value = copystring(wxResourceBuffer);
- if (isdigit(value[0]))
+ wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
+ if (wxIsdigit(value[0]))
{
- int val = (int)atol(value);
+ int val = (int)wxAtol(value);
wxResourceAddIdentifier(name, val, table);
}
delete[] name;
bool wxEatWhiteSpaceString(char *s)
{
- int ch = getc_string(s);
- if (ch == EOF)
- return TRUE;
-
- if ((ch != ' ') && (ch != '/') && (ch != ' ') && (ch != 10) && (ch != 13) && (ch != 9))
- {
- ungetc_string();
- return TRUE;
- }
+ int ch = 0;
- // Eat whitespace
- while (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
- ch = getc_string(s);
- // Check for comment
- if (ch == '/')
- {
- ch = getc_string(s);
- if (ch == '*')
- {
- bool finished = FALSE;
- while (!finished)
+ while ((ch = getc_string(s)) != EOF)
{
- ch = getc_string(s);
- if (ch == EOF)
- return FALSE;
- if (ch == '*')
- {
- int newCh = getc_string(s);
- if (newCh == '/')
- finished = TRUE;
- else
- {
+ switch (ch)
+ {
+ case ' ':
+ case 0x0a:
+ case 0x0d:
+ case 0x09:
+ break;
+ case '/':
+ {
+ int prev_ch = ch;
+ ch = getc_string(s);
+ if (ch == EOF)
+ {
+ ungetc_string();
+ return TRUE;
+ }
+
+ if (ch == '*')
+ {
+ // Eat C comment
+ prev_ch = 0;
+ while ((ch = getc_string(s)) != EOF)
+ {
+ if (ch == '/' && prev_ch == '*')
+ break;
+ prev_ch = ch;
+ }
+ }
+ else
+ {
+ ungetc_string();
+ ungetc_string();
+ return TRUE;
+ }
+ }
+ break;
+ default:
ungetc_string();
- }
- }
+ return TRUE;
+
+ }
}
- }
- else // False alarm
- return FALSE;
- }
- else if (ch != EOF)
- ungetc_string();
- return wxEatWhiteSpaceString(s);
+ return FALSE;
}
bool wxGetResourceTokenString(char *s)
if (strcmp(wxResourceBuffer, "#define") == 0)
{
wxGetResourceTokenString(s);
- char *name = copystring(wxResourceBuffer);
+ wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
wxGetResourceTokenString(s);
- char *value = copystring(wxResourceBuffer);
- if (isalpha(value[0]))
+ wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
+ if (wxIsdigit(value[0]))
{
- int val = (int)atol(value);
+ int val = (int)wxAtol(value);
wxResourceAddIdentifier(name, val, table);
}
else
*/
else if (strcmp(wxResourceBuffer, "static") != 0)
{
- char buf[300];
- strcpy(buf, _("Found "));
- strncat(buf, wxResourceBuffer, 30);
- strcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+ wxChar buf[300];
+ wxStrcpy(buf, _("Found "));
+ wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
+ wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
wxLogWarning(buf);
return FALSE;
}
wxLogWarning(_("Expected '*' whilst parsing resource."));
return FALSE;
}
- char nameBuf[100];
- strncpy(nameBuf, wxResourceBuffer+1, 99);
+ wxChar nameBuf[100];
+ wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
+ nameBuf[99] = 0;
// =
if (!wxGetResourceTokenString(s))
* resource loading facility
*/
-bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table)
+bool wxWindowBase::LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table)
{
if (!table)
table = wxDefaultResourceTable;
- wxItemResource *resource = table->FindResource((const char *)resourceName);
+ wxItemResource *resource = table->FindResource((const wxChar *)resourceName);
// if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
- if (!resource || (resource->GetType() == "") ||
- ! ((resource->GetType() == "wxDialog") || (resource->GetType() == "wxPanel")))
+ if (!resource || (resource->GetType() == wxT("")) ||
+ ! ((resource->GetType() == wxT("wxDialog")) || (resource->GetType() == wxT("wxPanel"))))
return FALSE;
wxString title(resource->GetTitle());
else if (IsKindOf(CLASSINFO(wxPanel)))
{
wxPanel* panel = (wxPanel *)this;
- if (!panel->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle, name))
+ if (!panel->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle | wxTAB_TRAVERSAL, name))
return FALSE;
}
else
{
- if (!this->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle, name))
+ if (!((wxWindow *)this)->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle, name))
return FALSE;
}
return TRUE;
}
-wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxItemResource* parentResource, const wxResourceTable *table)
+wxControl *wxWindowBase::CreateItem(const wxItemResource *resource, const wxItemResource* parentResource, const wxResourceTable *table)
{
if (!table)
table = wxDefaultResourceTable;
projects / wxWidgets.git / blobdiff