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

use a programmer-friendly macro for subclassing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-12-29 16:14:04 +00:00
parent daa85ee3af
commit 544fee32ee
60 changed files with 618 additions and 984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/src/xrc/xh_bmp.cpp
View File

@@ -33,14 +33,11 @@ wxObject *wxBitmapXmlHandler::DoCreateResource()
return new wxBitmap(GetBitmap(wxT(""))); return new wxBitmap(GetBitmap(wxT("")));
} }
bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node) bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxBitmap")); return IsOfClass(node, wxT("wxBitmap"));
} }
wxIconXmlHandler::wxIconXmlHandler() wxIconXmlHandler::wxIconXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
@@ -51,10 +48,7 @@ wxObject *wxIconXmlHandler::DoCreateResource()
return new wxIcon(GetIcon(wxT(""))); return new wxIcon(GetIcon(wxT("")));
} }
bool wxIconXmlHandler::CanHandle(wxXmlNode *node) bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxIcon")); return IsOfClass(node, wxT("wxIcon"));
} }

22
contrib/src/xrc/xh_bmpbt.cpp
View File

@@ -25,25 +25,27 @@
wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler() wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxBU_AUTODRAW); XRC_ADD_STYLE(wxBU_AUTODRAW);
ADD_STYLE(wxBU_LEFT); XRC_ADD_STYLE(wxBU_LEFT);
ADD_STYLE(wxBU_RIGHT); XRC_ADD_STYLE(wxBU_RIGHT);
ADD_STYLE(wxBU_TOP); XRC_ADD_STYLE(wxBU_TOP);
ADD_STYLE(wxBU_BOTTOM); XRC_ADD_STYLE(wxBU_BOTTOM);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxBitmapButtonXmlHandler::DoCreateResource() wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
{ {
wxBitmapButton *button = new wxBitmapButton(m_parentAsWindow, XRC_MAKE_INSTANCE(button, wxBitmapButton)
button->Create(m_parentAsWindow,
GetID(), GetID(),
GetBitmap(wxT("bitmap")), GetBitmap(wxT("bitmap")),
GetPosition(), GetSize(), GetPosition(), GetSize(),
GetStyle(wxT("style"), wxBU_AUTODRAW), GetStyle(wxT("style"), wxBU_AUTODRAW),
wxDefaultValidator, wxDefaultValidator,
GetName()); GetName());
if (GetBool(wxT("default"), 0) == 1) button->SetDefault(); if (GetBool(wxT("default"), 0))
button->SetDefault();
SetupWindow(button); SetupWindow(button);
if (!GetParamValue(wxT("selected")).IsEmpty()) if (!GetParamValue(wxT("selected")).IsEmpty())
@@ -56,11 +58,7 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
return button; return button;
} }
bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node) bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxBitmapButton")); return IsOfClass(node, wxT("wxBitmapButton"));
} }

21
contrib/src/xrc/xh_bttn.cpp
View File

@@ -26,20 +26,16 @@
wxButtonXmlHandler::wxButtonXmlHandler() wxButtonXmlHandler::wxButtonXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxBU_LEFT); XRC_ADD_STYLE(wxBU_LEFT);
ADD_STYLE(wxBU_RIGHT); XRC_ADD_STYLE(wxBU_RIGHT);
ADD_STYLE(wxBU_TOP); XRC_ADD_STYLE(wxBU_TOP);
ADD_STYLE(wxBU_BOTTOM); XRC_ADD_STYLE(wxBU_BOTTOM);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxButtonXmlHandler::DoCreateResource() wxObject *wxButtonXmlHandler::DoCreateResource()
{ {
wxButton *button = wxStaticCast(m_instance, wxButton); XRC_MAKE_INSTANCE(button, wxButton)
if (!button)
button = new wxButton;
button->Create(m_parentAsWindow, button->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -49,17 +45,14 @@ wxObject *wxButtonXmlHandler::DoCreateResource()
wxDefaultValidator, wxDefaultValidator,
GetName()); GetName());
if (GetBool(wxT("default"), 0) == 1) button->SetDefault(); if (GetBool(wxT("default"), 0))
button->SetDefault();
SetupWindow(button); SetupWindow(button);
return button; return button;
} }
bool wxButtonXmlHandler::CanHandle(wxXmlNode *node) bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxButton")); return IsOfClass(node, wxT("wxButton"));
} }

19
contrib/src/xrc/xh_cald.cpp
View File

@@ -27,21 +27,18 @@
wxCalendarCtrlXmlHandler::wxCalendarCtrlXmlHandler() wxCalendarCtrlXmlHandler::wxCalendarCtrlXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxCAL_SUNDAY_FIRST); XRC_ADD_STYLE(wxCAL_SUNDAY_FIRST);
ADD_STYLE(wxCAL_MONDAY_FIRST); XRC_ADD_STYLE(wxCAL_MONDAY_FIRST);
ADD_STYLE(wxCAL_SHOW_HOLIDAYS); XRC_ADD_STYLE(wxCAL_SHOW_HOLIDAYS);
ADD_STYLE(wxCAL_NO_YEAR_CHANGE); XRC_ADD_STYLE(wxCAL_NO_YEAR_CHANGE);
ADD_STYLE(wxCAL_NO_MONTH_CHANGE); XRC_ADD_STYLE(wxCAL_NO_MONTH_CHANGE);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxCalendarCtrlXmlHandler::DoCreateResource() wxObject *wxCalendarCtrlXmlHandler::DoCreateResource()
{ {
wxCalendarCtrl *calendar = wxStaticCast(m_instance, wxCalendarCtrl); XRC_MAKE_INSTANCE(calendar, wxCalendarCtrl);
if (!calendar)
calendar = new wxCalendarCtrl;
calendar->Create(m_parentAsWindow, calendar->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -56,11 +53,7 @@ wxObject *wxCalendarCtrlXmlHandler::DoCreateResource()
return calendar; return calendar;
} }
bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node) bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxCalendarCtrl")); return IsOfClass(node, wxT("wxCalendarCtrl"));
} }

7
contrib/src/xrc/xh_chckb.cpp
View File

@@ -32,10 +32,7 @@ wxCheckBoxXmlHandler::wxCheckBoxXmlHandler()
wxObject *wxCheckBoxXmlHandler::DoCreateResource() wxObject *wxCheckBoxXmlHandler::DoCreateResource()
{ {
wxCheckBox *control = wxStaticCast(m_instance, wxCheckBox); XRC_MAKE_INSTANCE(control, wxCheckBox)
if (!control)
control = new wxCheckBox;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -51,8 +48,6 @@ wxObject *wxCheckBoxXmlHandler::DoCreateResource()
return control; return control;
} }
bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node) bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxCheckBox")); return IsOfClass(node, wxT("wxCheckBox"));

12
contrib/src/xrc/xh_chckl.cpp
View File

@@ -45,10 +45,7 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
strings[i] = strList[i]; strings[i] = strList[i];
} }
wxCheckListBox *control = wxStaticCast(m_instance, wxCheckListBox); XRC_MAKE_INSTANCE(control, wxCheckListBox)
if (!control)
control = new wxCheckListBox;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -94,19 +91,14 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
// add to the list // add to the list
strList.Add(GetNodeContent(m_node)); strList.Add(GetNodeContent(m_node));
return NULL; return NULL;
} }
} }
bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node) bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node)
{ {
return (IsOfClass(node, wxT("wxCheckList")) || return (IsOfClass(node, wxT("wxCheckList")) ||
(m_insideBox && node->GetName() == wxT("item")) (m_insideBox && node->GetName() == wxT("item")));
);
} }

15
contrib/src/xrc/xh_choic.cpp
View File

@@ -25,7 +25,7 @@
wxChoiceXmlHandler::wxChoiceXmlHandler() wxChoiceXmlHandler::wxChoiceXmlHandler()
: wxXmlResourceHandler() , m_insideBox(FALSE) : wxXmlResourceHandler() , m_insideBox(FALSE)
{ {
ADD_STYLE(wxCB_SORT); XRC_ADD_STYLE(wxCB_SORT);
AddWindowStyles(); AddWindowStyles();
} }
@@ -48,10 +48,7 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
strings[i]=strList[i]; strings[i]=strList[i];
} }
wxChoice *control = wxStaticCast(m_instance, wxChoice); XRC_MAKE_INSTANCE(control, wxChoice)
if (!control)
control = new wxChoice;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -83,16 +80,10 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
return NULL; return NULL;
} }
} }
bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node) bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
{ {
return (IsOfClass(node, wxT("wxChoice")) || return (IsOfClass(node, wxT("wxChoice")) ||
(m_insideBox && node->GetName() == wxT("item")) (m_insideBox && node->GetName() == wxT("item")));
);
} }

20
contrib/src/xrc/xh_combo.cpp
View File

@@ -27,10 +27,10 @@
wxComboBoxXmlHandler::wxComboBoxXmlHandler() wxComboBoxXmlHandler::wxComboBoxXmlHandler()
: wxXmlResourceHandler() , m_insideBox(FALSE) : wxXmlResourceHandler() , m_insideBox(FALSE)
{ {
ADD_STYLE(wxCB_SIMPLE); XRC_ADD_STYLE(wxCB_SIMPLE);
ADD_STYLE(wxCB_SORT); XRC_ADD_STYLE(wxCB_SORT);
ADD_STYLE(wxCB_READONLY); XRC_ADD_STYLE(wxCB_READONLY);
ADD_STYLE(wxCB_DROPDOWN); XRC_ADD_STYLE(wxCB_DROPDOWN);
AddWindowStyles(); AddWindowStyles();
} }
@@ -53,11 +53,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
strings[i]=strList[i]; strings[i]=strList[i];
} }
XRC_MAKE_INSTANCE(control, wxComboBox)
wxComboBox *control = wxStaticCast(m_instance, wxComboBox);
if (!control)
control = new wxComboBox;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -90,16 +86,12 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
return NULL; return NULL;
} }
} }
bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node) bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
{ {
return (IsOfClass(node, wxT("wxComboBox")) || return (IsOfClass(node, wxT("wxComboBox")) ||
(m_insideBox && node->GetName() == wxT("item")) (m_insideBox && node->GetName() == wxT("item")));
);
} }
#endif #endif

35
contrib/src/xrc/xh_dlg.cpp
View File

@@ -27,25 +27,24 @@
wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler() wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxSTAY_ON_TOP); XRC_ADD_STYLE(wxSTAY_ON_TOP);
ADD_STYLE(wxCAPTION); XRC_ADD_STYLE(wxCAPTION);
ADD_STYLE(wxDEFAULT_DIALOG_STYLE); XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
ADD_STYLE(wxTHICK_FRAME); XRC_ADD_STYLE(wxTHICK_FRAME);
ADD_STYLE(wxSYSTEM_MENU); XRC_ADD_STYLE(wxSYSTEM_MENU);
ADD_STYLE(wxRESIZE_BORDER); XRC_ADD_STYLE(wxRESIZE_BORDER);
ADD_STYLE(wxRESIZE_BOX); XRC_ADD_STYLE(wxRESIZE_BOX);
ADD_STYLE(wxDIALOG_MODAL); XRC_ADD_STYLE(wxDIALOG_MODAL);
ADD_STYLE(wxDIALOG_MODELESS); XRC_ADD_STYLE(wxDIALOG_MODELESS);
XRC_ADD_STYLE(wxNO_3D);
XRC_ADD_STYLE(wxTAB_TRAVERSAL);
XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
XRC_ADD_STYLE(wxCLIP_CHILDREN);
ADD_STYLE(wxNO_3D);
ADD_STYLE(wxTAB_TRAVERSAL);
ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
ADD_STYLE(wxCLIP_CHILDREN);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxDialogXmlHandler::DoCreateResource() wxObject *wxDialogXmlHandler::DoCreateResource()
{ {
wxDialog *dlg = wxDynamicCast(m_instance, wxDialog); wxDialog *dlg = wxDynamicCast(m_instance, wxDialog);
@@ -58,10 +57,12 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
GetStyle(wxT("style"), wxDEFAULT_DIALOG_STYLE), GetStyle(wxT("style"), wxDEFAULT_DIALOG_STYLE),
GetName()); GetName());
if (HasParam(wxT("size"))) if (HasParam(wxT("size")))
dlg->SetClientSize(GetSize()); dlg->SetClientSize(GetSize());
if (HasParam(wxT("pos"))) if (HasParam(wxT("pos")))
dlg->Move(GetPosition()); dlg->Move(GetPosition());
SetupWindow(dlg); SetupWindow(dlg);
CreateChildren(dlg); CreateChildren(dlg);
@@ -72,11 +73,7 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
return dlg; return dlg;
} }
bool wxDialogXmlHandler::CanHandle(wxXmlNode *node) bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxDialog")); return IsOfClass(node, wxT("wxDialog"));
} }

43
contrib/src/xrc/xh_frame.cpp
View File

@@ -27,30 +27,29 @@
wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler() wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxSTAY_ON_TOP); XRC_ADD_STYLE(wxSTAY_ON_TOP);
ADD_STYLE(wxCAPTION); XRC_ADD_STYLE(wxCAPTION);
ADD_STYLE(wxDEFAULT_DIALOG_STYLE); XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
ADD_STYLE(wxDEFAULT_FRAME_STYLE); XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
ADD_STYLE(wxTHICK_FRAME); XRC_ADD_STYLE(wxTHICK_FRAME);
ADD_STYLE(wxSYSTEM_MENU); XRC_ADD_STYLE(wxSYSTEM_MENU);
ADD_STYLE(wxRESIZE_BORDER); XRC_ADD_STYLE(wxRESIZE_BORDER);
ADD_STYLE(wxRESIZE_BOX); XRC_ADD_STYLE(wxRESIZE_BOX);
ADD_STYLE(wxFRAME_TOOL_WINDOW); XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
ADD_STYLE(wxFRAME_FLOAT_ON_PARENT); XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
ADD_STYLE(wxMAXIMIZE_BOX); XRC_ADD_STYLE(wxMAXIMIZE_BOX);
ADD_STYLE(wxMINIMIZE_BOX); XRC_ADD_STYLE(wxMINIMIZE_BOX);
ADD_STYLE(wxSTAY_ON_TOP); XRC_ADD_STYLE(wxSTAY_ON_TOP);
XRC_ADD_STYLE(wxNO_3D);
XRC_ADD_STYLE(wxTAB_TRAVERSAL);
XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
XRC_ADD_STYLE(wxCLIP_CHILDREN);
ADD_STYLE(wxNO_3D);
ADD_STYLE(wxTAB_TRAVERSAL);
ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
ADD_STYLE(wxCLIP_CHILDREN);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxFrameXmlHandler::DoCreateResource() wxObject *wxFrameXmlHandler::DoCreateResource()
{ {
wxFrame *frame = wxDynamicCast(m_instance, wxFrame); wxFrame *frame = wxDynamicCast(m_instance, wxFrame);
@@ -63,10 +62,12 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE), GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE),
GetName()); GetName());
if (HasParam(wxT("size"))) if (HasParam(wxT("size")))
frame->SetClientSize(GetSize()); frame->SetClientSize(GetSize());
if (HasParam(wxT("pos"))) if (HasParam(wxT("pos")))
frame->Move(GetPosition()); frame->Move(GetPosition());
SetupWindow(frame); SetupWindow(frame);
CreateChildren(frame); CreateChildren(frame);
@@ -77,11 +78,7 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
return frame; return frame;
} }
bool wxFrameXmlHandler::CanHandle(wxXmlNode *node) bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxFrame")); return IsOfClass(node, wxT("wxFrame"));
} }

16
contrib/src/xrc/xh_gauge.cpp
View File

@@ -27,19 +27,16 @@
wxGaugeXmlHandler::wxGaugeXmlHandler() wxGaugeXmlHandler::wxGaugeXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE( wxGA_HORIZONTAL ); XRC_ADD_STYLE(wxGA_HORIZONTAL);
ADD_STYLE( wxGA_VERTICAL ); XRC_ADD_STYLE(wxGA_VERTICAL);
ADD_STYLE( wxGA_PROGRESSBAR ); XRC_ADD_STYLE(wxGA_PROGRESSBAR);
ADD_STYLE( wxGA_SMOOTH ); // windows only XRC_ADD_STYLE(wxGA_SMOOTH); // windows only
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxGaugeXmlHandler::DoCreateResource() wxObject *wxGaugeXmlHandler::DoCreateResource()
{ {
wxGauge *control = wxStaticCast(m_instance, wxGauge); XRC_MAKE_INSTANCE(control, wxGauge)
if (!control)
control = new wxGauge;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -67,12 +64,9 @@ wxObject *wxGaugeXmlHandler::DoCreateResource()
return control; return control;
} }
bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node) bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxGauge")); return IsOfClass(node, wxT("wxGauge"));
} }
#endif // wxUSE_GAUGE #endif // wxUSE_GAUGE

8
contrib/src/xrc/xh_html.cpp
View File

@@ -30,14 +30,14 @@
wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler() wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxHW_SCROLLBAR_NEVER); XRC_ADD_STYLE(wxHW_SCROLLBAR_NEVER);
ADD_STYLE(wxHW_SCROLLBAR_AUTO); XRC_ADD_STYLE(wxHW_SCROLLBAR_AUTO);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxHtmlWindowXmlHandler::DoCreateResource() wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
{ {
wxHtmlWindow *control = wxStaticCast(m_instance, wxHtmlWindow); XRC_MAKE_INSTANCE(control, wxHtmlWindow)
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -75,8 +75,6 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
return control; return control;
} }
bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node) bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxHtmlWindow")); return IsOfClass(node, wxT("wxHtmlWindow"));

27
contrib/src/xrc/xh_listb.cpp
View File

@@ -25,13 +25,13 @@
wxListBoxXmlHandler::wxListBoxXmlHandler() wxListBoxXmlHandler::wxListBoxXmlHandler()
: wxXmlResourceHandler() , m_insideBox(FALSE) : wxXmlResourceHandler() , m_insideBox(FALSE)
{ {
ADD_STYLE(wxLB_SINGLE); XRC_ADD_STYLE(wxLB_SINGLE);
ADD_STYLE(wxLB_MULTIPLE); XRC_ADD_STYLE(wxLB_MULTIPLE);
ADD_STYLE(wxLB_EXTENDED); XRC_ADD_STYLE(wxLB_EXTENDED);
ADD_STYLE(wxLB_HSCROLL); XRC_ADD_STYLE(wxLB_HSCROLL);
ADD_STYLE(wxLB_ALWAYS_SB); XRC_ADD_STYLE(wxLB_ALWAYS_SB);
ADD_STYLE(wxLB_NEEDED_SB); XRC_ADD_STYLE(wxLB_NEEDED_SB);
ADD_STYLE(wxLB_SORT); XRC_ADD_STYLE(wxLB_SORT);
AddWindowStyles(); AddWindowStyles();
} }
@@ -54,10 +54,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
strings[i]=strList[i]; strings[i]=strList[i];
} }
wxListBox *control = wxStaticCast(m_instance, wxListBox); XRC_MAKE_INSTANCE(control, wxListBox)
if (!control)
control = new wxListBox;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -89,16 +86,10 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
return NULL; return NULL;
} }
} }
bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node) bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node)
{ {
return (IsOfClass(node, wxT("wxListBox")) || return (IsOfClass(node, wxT("wxListBox")) ||
(m_insideBox && node->GetName() == wxT("item")) (m_insideBox && node->GetName() == wxT("item")));
);
} }

36
contrib/src/xrc/xh_listc.cpp
View File

@@ -27,29 +27,25 @@
wxListCtrlXmlHandler::wxListCtrlXmlHandler() wxListCtrlXmlHandler::wxListCtrlXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxLC_LIST); XRC_ADD_STYLE(wxLC_LIST);
ADD_STYLE(wxLC_REPORT); XRC_ADD_STYLE(wxLC_REPORT);
ADD_STYLE(wxLC_ICON); XRC_ADD_STYLE(wxLC_ICON);
ADD_STYLE(wxLC_SMALL_ICON); XRC_ADD_STYLE(wxLC_SMALL_ICON);
ADD_STYLE(wxLC_ALIGN_TOP); XRC_ADD_STYLE(wxLC_ALIGN_TOP);
ADD_STYLE(wxLC_ALIGN_LEFT); XRC_ADD_STYLE(wxLC_ALIGN_LEFT);
ADD_STYLE(wxLC_AUTOARRANGE); XRC_ADD_STYLE(wxLC_AUTOARRANGE);
ADD_STYLE(wxLC_USER_TEXT); XRC_ADD_STYLE(wxLC_USER_TEXT);
ADD_STYLE(wxLC_EDIT_LABELS); XRC_ADD_STYLE(wxLC_EDIT_LABELS);
ADD_STYLE(wxLC_NO_HEADER); XRC_ADD_STYLE(wxLC_NO_HEADER);
ADD_STYLE(wxLC_SINGLE_SEL); XRC_ADD_STYLE(wxLC_SINGLE_SEL);
ADD_STYLE(wxLC_SORT_ASCENDING); XRC_ADD_STYLE(wxLC_SORT_ASCENDING);
ADD_STYLE(wxLC_SORT_DESCENDING); XRC_ADD_STYLE(wxLC_SORT_DESCENDING);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxListCtrlXmlHandler::DoCreateResource() wxObject *wxListCtrlXmlHandler::DoCreateResource()
{ {
wxListCtrl *list = wxStaticCast(m_instance, wxListCtrl); XRC_MAKE_INSTANCE(list, wxListCtrl)
if (!list)
list = new wxListCtrl;
list->Create(m_parentAsWindow, list->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -58,15 +54,13 @@ wxObject *wxListCtrlXmlHandler::DoCreateResource()
wxDefaultValidator, wxDefaultValidator,
GetName()); GetName());
/* TODO: columns definition */ // FIXME: add columns definition
SetupWindow(list); SetupWindow(list);
return list; return list;
} }
bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node) bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxListCtrl")); return IsOfClass(node, wxT("wxListCtrl"));

12
contrib/src/xrc/xh_menu.cpp
View File

@@ -27,11 +27,9 @@
wxMenuXmlHandler::wxMenuXmlHandler() : wxMenuXmlHandler::wxMenuXmlHandler() :
wxXmlResourceHandler(), m_insideMenu(FALSE) wxXmlResourceHandler(), m_insideMenu(FALSE)
{ {
ADD_STYLE(wxMENU_TEAROFF); XRC_ADD_STYLE(wxMENU_TEAROFF);
} }
wxObject *wxMenuXmlHandler::DoCreateResource() wxObject *wxMenuXmlHandler::DoCreateResource()
{ {
if (m_class == wxT("wxMenu")) if (m_class == wxT("wxMenu"))
@@ -103,16 +101,11 @@ bool wxMenuXmlHandler::CanHandle(wxXmlNode *node)
); );
} }
wxMenuBarXmlHandler::wxMenuBarXmlHandler() : wxXmlResourceHandler() wxMenuBarXmlHandler::wxMenuBarXmlHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxMB_DOCKABLE); XRC_ADD_STYLE(wxMB_DOCKABLE);
} }
wxObject *wxMenuBarXmlHandler::DoCreateResource() wxObject *wxMenuBarXmlHandler::DoCreateResource()
{ {
wxMenuBar *menubar = new wxMenuBar(GetStyle()); wxMenuBar *menubar = new wxMenuBar(GetStyle());
@@ -134,4 +127,3 @@ bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxMenuBar")); return IsOfClass(node, wxT("wxMenuBar"));
} }

20
contrib/src/xrc/xh_notbk.cpp
View File

@@ -30,15 +30,13 @@
wxNotebookXmlHandler::wxNotebookXmlHandler() wxNotebookXmlHandler::wxNotebookXmlHandler()
: wxXmlResourceHandler(), m_isInside(FALSE), m_notebook(NULL) : wxXmlResourceHandler(), m_isInside(FALSE), m_notebook(NULL)
{ {
ADD_STYLE(wxNB_FIXEDWIDTH); XRC_ADD_STYLE(wxNB_FIXEDWIDTH);
ADD_STYLE(wxNB_LEFT); XRC_ADD_STYLE(wxNB_LEFT);
ADD_STYLE(wxNB_RIGHT); XRC_ADD_STYLE(wxNB_RIGHT);
ADD_STYLE(wxNB_BOTTOM); XRC_ADD_STYLE(wxNB_BOTTOM);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxNotebookXmlHandler::DoCreateResource() wxObject *wxNotebookXmlHandler::DoCreateResource()
{ {
if (m_class == wxT("notebookpage")) if (m_class == wxT("notebookpage"))
@@ -70,11 +68,9 @@ wxObject *wxNotebookXmlHandler::DoCreateResource()
} }
} }
else { else
wxNotebook *nb = wxStaticCast(m_instance, wxNotebook); {
XRC_MAKE_INSTANCE(nb, wxNotebook)
if ( !nb )
nb = new wxNotebook;
nb->Create(m_parentAsWindow, nb->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -97,8 +93,6 @@ wxObject *wxNotebookXmlHandler::DoCreateResource()
} }
} }
bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node) bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node)
{ {
return ((!m_isInside && IsOfClass(node, wxT("wxNotebook"))) || return ((!m_isInside && IsOfClass(node, wxT("wxNotebook"))) ||

16
contrib/src/xrc/xh_panel.cpp
View File

@@ -25,21 +25,16 @@
wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler() wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxNO_3D); XRC_ADD_STYLE(wxNO_3D);
ADD_STYLE(wxTAB_TRAVERSAL); XRC_ADD_STYLE(wxTAB_TRAVERSAL);
ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY); XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
ADD_STYLE(wxCLIP_CHILDREN); XRC_ADD_STYLE(wxCLIP_CHILDREN);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxPanelXmlHandler::DoCreateResource() wxObject *wxPanelXmlHandler::DoCreateResource()
{ {
wxPanel *panel = wxDynamicCast(m_instance, wxPanel); XRC_MAKE_INSTANCE(panel, wxPanel)
if (!panel)
panel = new wxPanel;
panel->Create(m_parentAsWindow, panel->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -53,7 +48,6 @@ wxObject *wxPanelXmlHandler::DoCreateResource()
return panel; return panel;
} }
bool wxPanelXmlHandler::CanHandle(wxXmlNode *node) bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxPanel")); return IsOfClass(node, wxT("wxPanel"));

10
contrib/src/xrc/xh_radbt.cpp
View File

@@ -27,7 +27,7 @@
wxRadioButtonXmlHandler::wxRadioButtonXmlHandler() wxRadioButtonXmlHandler::wxRadioButtonXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE( wxRB_GROUP ); XRC_ADD_STYLE(wxRB_GROUP);
AddWindowStyles(); AddWindowStyles();
} }
@@ -40,10 +40,7 @@ wxObject *wxRadioButtonXmlHandler::DoCreateResource()
* normal radio button. * normal radio button.
*/ */
wxRadioButton *control = wxStaticCast(m_instance, wxRadioButton); XRC_MAKE_INSTANCE(control, wxRadioButton)
if (!control)
control = new wxRadioButton;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -59,12 +56,9 @@ wxObject *wxRadioButtonXmlHandler::DoCreateResource()
return control; return control;
} }
bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node) bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxRadioButton")); return IsOfClass(node, wxT("wxRadioButton"));
} }
#endif #endif

18
contrib/src/xrc/xh_radbx.cpp
View File

@@ -27,10 +27,10 @@
wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() wxRadioBoxXmlHandler::wxRadioBoxXmlHandler()
: wxXmlResourceHandler(), m_insideBox(FALSE) : wxXmlResourceHandler(), m_insideBox(FALSE)
{ {
ADD_STYLE(wxRA_SPECIFY_COLS); XRC_ADD_STYLE(wxRA_SPECIFY_COLS);
ADD_STYLE(wxRA_HORIZONTAL); XRC_ADD_STYLE(wxRA_HORIZONTAL);
ADD_STYLE(wxRA_SPECIFY_ROWS); XRC_ADD_STYLE(wxRA_SPECIFY_ROWS);
ADD_STYLE(wxRA_VERTICAL); XRC_ADD_STYLE(wxRA_VERTICAL);
AddWindowStyles(); AddWindowStyles();
} }
@@ -53,10 +53,7 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
strings[i]=strList[i]; strings[i]=strList[i];
} }
wxRadioBox *control = wxStaticCast(m_instance, wxRadioBox); XRC_MAKE_INSTANCE(control, wxRadioBox)
if (!control)
control = new wxRadioBox;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -93,13 +90,10 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
} }
bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node) bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node)
{ {
return (IsOfClass(node, wxT("wxRadioBox")) || return (IsOfClass(node, wxT("wxRadioBox")) ||
(m_insideBox && node->GetName() == wxT("item")) (m_insideBox && node->GetName() == wxT("item")));
);
} }
#endif #endif

18
contrib/src/xrc/xh_scrol.cpp
View File

@@ -26,17 +26,14 @@
wxScrollBarXmlHandler::wxScrollBarXmlHandler() wxScrollBarXmlHandler::wxScrollBarXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE( wxSB_HORIZONTAL ); XRC_ADD_STYLE(wxSB_HORIZONTAL);
ADD_STYLE( wxSB_VERTICAL ); XRC_ADD_STYLE(wxSB_VERTICAL);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxScrollBarXmlHandler::DoCreateResource() wxObject *wxScrollBarXmlHandler::DoCreateResource()
{ {
wxScrollBar *control = wxStaticCast(m_instance, wxScrollBar); XRC_MAKE_INSTANCE(control, wxScrollBar)
if (!control)
control = new wxScrollBar;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -48,21 +45,14 @@ wxObject *wxScrollBarXmlHandler::DoCreateResource()
control->SetScrollbar(GetLong( wxT("value"), 0), control->SetScrollbar(GetLong( wxT("value"), 0),
GetLong( wxT("thumbsize"),1), GetLong( wxT("thumbsize"),1),
GetLong( wxT("range"), 10), GetLong( wxT("range"), 10),
GetLong( wxT("pagesize"),1) GetLong( wxT("pagesize"),1));
);
SetupWindow(control); SetupWindow(control);
return control; return control;
} }
bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node) bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxScrollBar")); return IsOfClass(node, wxT("wxScrollBar"));
} }

50
contrib/src/xrc/xh_sizer.cpp
View File

@@ -39,35 +39,35 @@ bool wxSizerXmlHandler::IsSizerNode(wxXmlNode *node)
wxSizerXmlHandler::wxSizerXmlHandler() wxSizerXmlHandler::wxSizerXmlHandler()
: wxXmlResourceHandler(), m_isInside(FALSE), m_parentSizer(NULL) : wxXmlResourceHandler(), m_isInside(FALSE), m_parentSizer(NULL)
{ {
ADD_STYLE(wxHORIZONTAL); XRC_ADD_STYLE(wxHORIZONTAL);
ADD_STYLE(wxVERTICAL); XRC_ADD_STYLE(wxVERTICAL);
// and flags // and flags
ADD_STYLE(wxLEFT); XRC_ADD_STYLE(wxLEFT);
ADD_STYLE(wxRIGHT); XRC_ADD_STYLE(wxRIGHT);
ADD_STYLE(wxTOP); XRC_ADD_STYLE(wxTOP);
ADD_STYLE(wxBOTTOM); XRC_ADD_STYLE(wxBOTTOM);
ADD_STYLE(wxNORTH); XRC_ADD_STYLE(wxNORTH);
ADD_STYLE(wxSOUTH); XRC_ADD_STYLE(wxSOUTH);
ADD_STYLE(wxEAST); XRC_ADD_STYLE(wxEAST);
ADD_STYLE(wxWEST); XRC_ADD_STYLE(wxWEST);
ADD_STYLE(wxALL); XRC_ADD_STYLE(wxALL);
ADD_STYLE(wxGROW); XRC_ADD_STYLE(wxGROW);
ADD_STYLE(wxEXPAND); XRC_ADD_STYLE(wxEXPAND);
ADD_STYLE(wxSHAPED); XRC_ADD_STYLE(wxSHAPED);
ADD_STYLE(wxSTRETCH_NOT); XRC_ADD_STYLE(wxSTRETCH_NOT);
ADD_STYLE(wxALIGN_CENTER); XRC_ADD_STYLE(wxALIGN_CENTER);
ADD_STYLE(wxALIGN_CENTRE); XRC_ADD_STYLE(wxALIGN_CENTRE);
ADD_STYLE(wxALIGN_LEFT); XRC_ADD_STYLE(wxALIGN_LEFT);
ADD_STYLE(wxALIGN_TOP); XRC_ADD_STYLE(wxALIGN_TOP);
ADD_STYLE(wxALIGN_RIGHT); XRC_ADD_STYLE(wxALIGN_RIGHT);
ADD_STYLE(wxALIGN_BOTTOM); XRC_ADD_STYLE(wxALIGN_BOTTOM);
ADD_STYLE(wxALIGN_CENTER_HORIZONTAL); XRC_ADD_STYLE(wxALIGN_CENTER_HORIZONTAL);
ADD_STYLE(wxALIGN_CENTRE_HORIZONTAL); XRC_ADD_STYLE(wxALIGN_CENTRE_HORIZONTAL);
ADD_STYLE(wxALIGN_CENTER_VERTICAL); XRC_ADD_STYLE(wxALIGN_CENTER_VERTICAL);
ADD_STYLE(wxALIGN_CENTRE_VERTICAL); XRC_ADD_STYLE(wxALIGN_CENTRE_VERTICAL);
} }

28
contrib/src/xrc/xh_slidr.cpp
View File

@@ -27,25 +27,22 @@
wxSliderXmlHandler::wxSliderXmlHandler() wxSliderXmlHandler::wxSliderXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE( wxSL_HORIZONTAL ); XRC_ADD_STYLE(wxSL_HORIZONTAL);
ADD_STYLE( wxSL_VERTICAL ); XRC_ADD_STYLE(wxSL_VERTICAL);
ADD_STYLE( wxSL_AUTOTICKS ); XRC_ADD_STYLE(wxSL_AUTOTICKS);
ADD_STYLE( wxSL_LABELS ); XRC_ADD_STYLE(wxSL_LABELS);
ADD_STYLE( wxSL_LEFT ); XRC_ADD_STYLE(wxSL_LEFT);
ADD_STYLE( wxSL_TOP ); XRC_ADD_STYLE(wxSL_TOP);
ADD_STYLE( wxSL_RIGHT ); XRC_ADD_STYLE(wxSL_RIGHT);
ADD_STYLE( wxSL_BOTTOM ); XRC_ADD_STYLE(wxSL_BOTTOM);
ADD_STYLE( wxSL_BOTH ); XRC_ADD_STYLE(wxSL_BOTH);
ADD_STYLE( wxSL_SELRANGE ); XRC_ADD_STYLE(wxSL_SELRANGE);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxSliderXmlHandler::DoCreateResource() wxObject *wxSliderXmlHandler::DoCreateResource()
{ {
wxSlider *control = wxStaticCast(m_instance, wxSlider); XRC_MAKE_INSTANCE(control, wxSlider)
if (!control)
control = new wxSlider;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -87,12 +84,9 @@ wxObject *wxSliderXmlHandler::DoCreateResource()
return control; return control;
} }
bool wxSliderXmlHandler::CanHandle(wxXmlNode *node) bool wxSliderXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxSlider")); return IsOfClass(node, wxT("wxSlider"));
} }
#endif #endif

32
contrib/src/xrc/xh_spin.cpp
View File

@@ -27,19 +27,16 @@
wxSpinButtonXmlHandler::wxSpinButtonXmlHandler() wxSpinButtonXmlHandler::wxSpinButtonXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE( wxSP_HORIZONTAL ); XRC_ADD_STYLE(wxSP_HORIZONTAL);
ADD_STYLE( wxSP_VERTICAL ); XRC_ADD_STYLE(wxSP_VERTICAL);
ADD_STYLE( wxSP_ARROW_KEYS ); XRC_ADD_STYLE(wxSP_ARROW_KEYS);
ADD_STYLE( wxSP_WRAP ); XRC_ADD_STYLE(wxSP_WRAP);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxSpinButtonXmlHandler::DoCreateResource() wxObject *wxSpinButtonXmlHandler::DoCreateResource()
{ {
wxSpinButton *control = wxStaticCast(m_instance, wxSpinButton); XRC_MAKE_INSTANCE(control, wxSpinButton)
if (!control)
control = new wxSpinButton;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -55,8 +52,6 @@ wxObject *wxSpinButtonXmlHandler::DoCreateResource()
return control; return control;
} }
bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node) bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxSpinButton")); return IsOfClass(node, wxT("wxSpinButton"));
@@ -69,15 +64,17 @@ bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE( wxSP_HORIZONTAL ); XRC_ADD_STYLE(wxSP_HORIZONTAL);
ADD_STYLE( wxSP_VERTICAL ); XRC_ADD_STYLE(wxSP_VERTICAL);
ADD_STYLE( wxSP_ARROW_KEYS ); XRC_ADD_STYLE(wxSP_ARROW_KEYS);
ADD_STYLE( wxSP_WRAP ); XRC_ADD_STYLE(wxSP_WRAP);
} }
wxObject *wxSpinCtrlXmlHandler::DoCreateResource() wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
{ {
wxSpinCtrl *control = new wxSpinCtrl(m_parentAsWindow, XRC_MAKE_INSTANCE(control, wxSpinCtrl)
control->Create(m_parentAsWindow,
GetID(), GetID(),
GetText(wxT("value")), GetText(wxT("value")),
GetPosition(), GetSize(), GetPosition(), GetSize(),
@@ -85,16 +82,13 @@ wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
GetLong(wxT("min"), wxSP_DEFAULT_MIN), GetLong(wxT("min"), wxSP_DEFAULT_MIN),
GetLong(wxT("max"), wxSP_DEFAULT_MAX), GetLong(wxT("max"), wxSP_DEFAULT_MAX),
GetLong(wxT("value"), wxSP_DEFAULT_VALUE), GetLong(wxT("value"), wxSP_DEFAULT_VALUE),
GetName() GetName());
);
SetupWindow(control); SetupWindow(control);
return control; return control;
} }
bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node) bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxSpinCtrl")); return IsOfClass(node, wxT("wxSpinCtrl"));

9
contrib/src/xrc/xh_stbmp.cpp
View File

@@ -30,10 +30,7 @@ wxStaticBitmapXmlHandler::wxStaticBitmapXmlHandler()
wxObject *wxStaticBitmapXmlHandler::DoCreateResource() wxObject *wxStaticBitmapXmlHandler::DoCreateResource()
{ {
wxStaticBitmap *bmp = wxStaticCast(m_instance, wxStaticBitmap); XRC_MAKE_INSTANCE(bmp, wxStaticBitmap)
if (!bmp)
bmp = new wxStaticBitmap;
bmp->Create(m_parentAsWindow, bmp->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -47,11 +44,7 @@ wxObject *wxStaticBitmapXmlHandler::DoCreateResource()
return bmp; return bmp;
} }
bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node) bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxStaticBitmap")); return IsOfClass(node, wxT("wxStaticBitmap"));
} }

9
contrib/src/xrc/xh_stbox.cpp
View File

@@ -30,10 +30,7 @@ wxStaticBoxXmlHandler::wxStaticBoxXmlHandler()
wxObject *wxStaticBoxXmlHandler::DoCreateResource() wxObject *wxStaticBoxXmlHandler::DoCreateResource()
{ {
wxStaticBox *box = wxStaticCast(m_instance, wxStaticBox); XRC_MAKE_INSTANCE(box, wxStaticBox)
if (!box)
box = new wxStaticBox;
box->Create(m_parentAsWindow, box->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -47,11 +44,7 @@ wxObject *wxStaticBoxXmlHandler::DoCreateResource()
return box; return box;
} }
bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node) bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxStaticBox")); return IsOfClass(node, wxT("wxStaticBox"));
} }

11
contrib/src/xrc/xh_stlin.cpp
View File

@@ -27,17 +27,14 @@
wxStaticLineXmlHandler::wxStaticLineXmlHandler() wxStaticLineXmlHandler::wxStaticLineXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxLI_HORIZONTAL); XRC_ADD_STYLE(wxLI_HORIZONTAL);
ADD_STYLE(wxLI_VERTICAL); XRC_ADD_STYLE(wxLI_VERTICAL);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxStaticLineXmlHandler::DoCreateResource() wxObject *wxStaticLineXmlHandler::DoCreateResource()
{ {
wxStaticLine *line = wxStaticCast(m_instance, wxStaticLine); XRC_MAKE_INSTANCE(line, wxStaticLine)
if (!line)
line = new wxStaticLine;
line->Create(m_parentAsWindow, line->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -50,8 +47,6 @@ wxObject *wxStaticLineXmlHandler::DoCreateResource()
return line; return line;
} }
bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node) bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxStaticLine")); return IsOfClass(node, wxT("wxStaticLine"));

17
contrib/src/xrc/xh_sttxt.cpp
View File

@@ -25,19 +25,16 @@
wxStaticTextXmlHandler::wxStaticTextXmlHandler() wxStaticTextXmlHandler::wxStaticTextXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxST_NO_AUTORESIZE); XRC_ADD_STYLE(wxST_NO_AUTORESIZE);
ADD_STYLE(wxALIGN_LEFT); XRC_ADD_STYLE(wxALIGN_LEFT);
ADD_STYLE(wxALIGN_RIGHT); XRC_ADD_STYLE(wxALIGN_RIGHT);
ADD_STYLE(wxALIGN_CENTRE); XRC_ADD_STYLE(wxALIGN_CENTRE);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxStaticTextXmlHandler::DoCreateResource() wxObject *wxStaticTextXmlHandler::DoCreateResource()
{ {
wxStaticText *text = wxStaticCast(m_instance, wxStaticText); XRC_MAKE_INSTANCE(text, wxStaticText)
if (!text)
text = new wxStaticText;
text->Create(m_parentAsWindow, text->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -51,11 +48,7 @@ wxObject *wxStaticTextXmlHandler::DoCreateResource()
return text; return text;
} }
bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node) bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxStaticText")); return IsOfClass(node, wxT("wxStaticText"));
} }

21
contrib/src/xrc/xh_text.cpp
View File

@@ -24,21 +24,18 @@
wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler() wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxTE_PROCESS_ENTER); XRC_ADD_STYLE(wxTE_PROCESS_ENTER);
ADD_STYLE(wxTE_PROCESS_TAB); XRC_ADD_STYLE(wxTE_PROCESS_TAB);
ADD_STYLE(wxTE_MULTILINE); XRC_ADD_STYLE(wxTE_MULTILINE);
ADD_STYLE(wxTE_PASSWORD); XRC_ADD_STYLE(wxTE_PASSWORD);
ADD_STYLE(wxTE_READONLY); XRC_ADD_STYLE(wxTE_READONLY);
ADD_STYLE(wxHSCROLL); XRC_ADD_STYLE(wxHSCROLL);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxTextCtrlXmlHandler::DoCreateResource() wxObject *wxTextCtrlXmlHandler::DoCreateResource()
{ {
wxTextCtrl *text = wxStaticCast(m_instance, wxTextCtrl); XRC_MAKE_INSTANCE(text, wxTextCtrl)
if ( !text )
text = new wxTextCtrl;
text->Create(m_parentAsWindow, text->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -53,11 +50,7 @@ wxObject *wxTextCtrlXmlHandler::DoCreateResource()
return text; return text;
} }
bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node) bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxTextCtrl")); return IsOfClass(node, wxT("wxTextCtrl"));
} }

17
contrib/src/xrc/xh_toolb.cpp
View File

@@ -28,14 +28,12 @@
wxToolBarXmlHandler::wxToolBarXmlHandler() wxToolBarXmlHandler::wxToolBarXmlHandler()
: wxXmlResourceHandler(), m_isInside(FALSE), m_toolbar(NULL) : wxXmlResourceHandler(), m_isInside(FALSE), m_toolbar(NULL)
{ {
ADD_STYLE(wxTB_FLAT); XRC_ADD_STYLE(wxTB_FLAT);
ADD_STYLE(wxTB_DOCKABLE); XRC_ADD_STYLE(wxTB_DOCKABLE);
ADD_STYLE(wxTB_VERTICAL); XRC_ADD_STYLE(wxTB_VERTICAL);
ADD_STYLE(wxTB_HORIZONTAL); XRC_ADD_STYLE(wxTB_HORIZONTAL);
} }
wxObject *wxToolBarXmlHandler::DoCreateResource() wxObject *wxToolBarXmlHandler::DoCreateResource()
{ {
if (m_class == wxT("tool")) if (m_class == wxT("tool"))
@@ -67,10 +65,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
if (!(style & wxNO_BORDER)) style |= wxNO_BORDER; if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
#endif #endif
wxToolBar *toolbar = wxStaticCast(m_instance, wxToolBar); XRC_MAKE_INSTANCE(toolbar, wxToolBar)
if ( !toolbar )
toolbar = new wxToolBar;
toolbar->Create(m_parentAsWindow, toolbar->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -135,8 +130,6 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
} }
} }
bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node) bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node)
{ {
return ((!m_isInside && IsOfClass(node, wxT("wxToolBar"))) || return ((!m_isInside && IsOfClass(node, wxT("wxToolBar"))) ||

16
contrib/src/xrc/xh_tree.cpp
View File

@@ -26,19 +26,15 @@
wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler() wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxTR_HAS_BUTTONS); XRC_ADD_STYLE(wxTR_HAS_BUTTONS);
ADD_STYLE(wxTR_EDIT_LABELS); XRC_ADD_STYLE(wxTR_EDIT_LABELS);
ADD_STYLE(wxTR_MULTIPLE); XRC_ADD_STYLE(wxTR_MULTIPLE);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxTreeCtrlXmlHandler::DoCreateResource() wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
{ {
wxTreeCtrl *tree = wxStaticCast(m_instance, wxTreeCtrl); XRC_MAKE_INSTANCE(tree, wxTreeCtrl)
if (!tree)
tree = new wxTreeCtrl;
tree->Create(m_parentAsWindow, tree->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -52,11 +48,7 @@ wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
return tree; return tree;
} }
bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node) bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxTreeCtrl")); return IsOfClass(node, wxT("wxTreeCtrl"));
} }

6
src/xrc/xh_bmp.cpp
View File

@@ -33,14 +33,11 @@ wxObject *wxBitmapXmlHandler::DoCreateResource()
return new wxBitmap(GetBitmap(wxT(""))); return new wxBitmap(GetBitmap(wxT("")));
} }
bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node) bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxBitmap")); return IsOfClass(node, wxT("wxBitmap"));
} }
wxIconXmlHandler::wxIconXmlHandler() wxIconXmlHandler::wxIconXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
@@ -51,10 +48,7 @@ wxObject *wxIconXmlHandler::DoCreateResource()
return new wxIcon(GetIcon(wxT(""))); return new wxIcon(GetIcon(wxT("")));
} }
bool wxIconXmlHandler::CanHandle(wxXmlNode *node) bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxIcon")); return IsOfClass(node, wxT("wxIcon"));
} }

22
src/xrc/xh_bmpbt.cpp
View File

@@ -25,25 +25,27 @@
wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler() wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxBU_AUTODRAW); XRC_ADD_STYLE(wxBU_AUTODRAW);
ADD_STYLE(wxBU_LEFT); XRC_ADD_STYLE(wxBU_LEFT);
ADD_STYLE(wxBU_RIGHT); XRC_ADD_STYLE(wxBU_RIGHT);
ADD_STYLE(wxBU_TOP); XRC_ADD_STYLE(wxBU_TOP);
ADD_STYLE(wxBU_BOTTOM); XRC_ADD_STYLE(wxBU_BOTTOM);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxBitmapButtonXmlHandler::DoCreateResource() wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
{ {
wxBitmapButton *button = new wxBitmapButton(m_parentAsWindow, XRC_MAKE_INSTANCE(button, wxBitmapButton)
button->Create(m_parentAsWindow,
GetID(), GetID(),
GetBitmap(wxT("bitmap")), GetBitmap(wxT("bitmap")),
GetPosition(), GetSize(), GetPosition(), GetSize(),
GetStyle(wxT("style"), wxBU_AUTODRAW), GetStyle(wxT("style"), wxBU_AUTODRAW),
wxDefaultValidator, wxDefaultValidator,
GetName()); GetName());
if (GetBool(wxT("default"), 0) == 1) button->SetDefault(); if (GetBool(wxT("default"), 0))
button->SetDefault();
SetupWindow(button); SetupWindow(button);
if (!GetParamValue(wxT("selected")).IsEmpty()) if (!GetParamValue(wxT("selected")).IsEmpty())
@@ -56,11 +58,7 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
return button; return button;
} }
bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node) bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxBitmapButton")); return IsOfClass(node, wxT("wxBitmapButton"));
} }

21
src/xrc/xh_bttn.cpp
View File

@@ -26,20 +26,16 @@
wxButtonXmlHandler::wxButtonXmlHandler() wxButtonXmlHandler::wxButtonXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxBU_LEFT); XRC_ADD_STYLE(wxBU_LEFT);
ADD_STYLE(wxBU_RIGHT); XRC_ADD_STYLE(wxBU_RIGHT);
ADD_STYLE(wxBU_TOP); XRC_ADD_STYLE(wxBU_TOP);
ADD_STYLE(wxBU_BOTTOM); XRC_ADD_STYLE(wxBU_BOTTOM);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxButtonXmlHandler::DoCreateResource() wxObject *wxButtonXmlHandler::DoCreateResource()
{ {
wxButton *button = wxStaticCast(m_instance, wxButton); XRC_MAKE_INSTANCE(button, wxButton)
if (!button)
button = new wxButton;
button->Create(m_parentAsWindow, button->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -49,17 +45,14 @@ wxObject *wxButtonXmlHandler::DoCreateResource()
wxDefaultValidator, wxDefaultValidator,
GetName()); GetName());
if (GetBool(wxT("default"), 0) == 1) button->SetDefault(); if (GetBool(wxT("default"), 0))
button->SetDefault();
SetupWindow(button); SetupWindow(button);
return button; return button;
} }
bool wxButtonXmlHandler::CanHandle(wxXmlNode *node) bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxButton")); return IsOfClass(node, wxT("wxButton"));
} }

19
src/xrc/xh_cald.cpp
View File

@@ -27,21 +27,18 @@
wxCalendarCtrlXmlHandler::wxCalendarCtrlXmlHandler() wxCalendarCtrlXmlHandler::wxCalendarCtrlXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxCAL_SUNDAY_FIRST); XRC_ADD_STYLE(wxCAL_SUNDAY_FIRST);
ADD_STYLE(wxCAL_MONDAY_FIRST); XRC_ADD_STYLE(wxCAL_MONDAY_FIRST);
ADD_STYLE(wxCAL_SHOW_HOLIDAYS); XRC_ADD_STYLE(wxCAL_SHOW_HOLIDAYS);
ADD_STYLE(wxCAL_NO_YEAR_CHANGE); XRC_ADD_STYLE(wxCAL_NO_YEAR_CHANGE);
ADD_STYLE(wxCAL_NO_MONTH_CHANGE); XRC_ADD_STYLE(wxCAL_NO_MONTH_CHANGE);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxCalendarCtrlXmlHandler::DoCreateResource() wxObject *wxCalendarCtrlXmlHandler::DoCreateResource()
{ {
wxCalendarCtrl *calendar = wxStaticCast(m_instance, wxCalendarCtrl); XRC_MAKE_INSTANCE(calendar, wxCalendarCtrl);
if (!calendar)
calendar = new wxCalendarCtrl;
calendar->Create(m_parentAsWindow, calendar->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -56,11 +53,7 @@ wxObject *wxCalendarCtrlXmlHandler::DoCreateResource()
return calendar; return calendar;
} }
bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node) bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxCalendarCtrl")); return IsOfClass(node, wxT("wxCalendarCtrl"));
} }

7
src/xrc/xh_chckb.cpp
View File

@@ -32,10 +32,7 @@ wxCheckBoxXmlHandler::wxCheckBoxXmlHandler()
wxObject *wxCheckBoxXmlHandler::DoCreateResource() wxObject *wxCheckBoxXmlHandler::DoCreateResource()
{ {
wxCheckBox *control = wxStaticCast(m_instance, wxCheckBox); XRC_MAKE_INSTANCE(control, wxCheckBox)
if (!control)
control = new wxCheckBox;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -51,8 +48,6 @@ wxObject *wxCheckBoxXmlHandler::DoCreateResource()
return control; return control;
} }
bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node) bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxCheckBox")); return IsOfClass(node, wxT("wxCheckBox"));

12
src/xrc/xh_chckl.cpp
View File

@@ -45,10 +45,7 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
strings[i] = strList[i]; strings[i] = strList[i];
} }
wxCheckListBox *control = wxStaticCast(m_instance, wxCheckListBox); XRC_MAKE_INSTANCE(control, wxCheckListBox)
if (!control)
control = new wxCheckListBox;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -94,19 +91,14 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
// add to the list // add to the list
strList.Add(GetNodeContent(m_node)); strList.Add(GetNodeContent(m_node));
return NULL; return NULL;
} }
} }
bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node) bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node)
{ {
return (IsOfClass(node, wxT("wxCheckList")) || return (IsOfClass(node, wxT("wxCheckList")) ||
(m_insideBox && node->GetName() == wxT("item")) (m_insideBox && node->GetName() == wxT("item")));
);
} }

15
src/xrc/xh_choic.cpp
View File

@@ -25,7 +25,7 @@
wxChoiceXmlHandler::wxChoiceXmlHandler() wxChoiceXmlHandler::wxChoiceXmlHandler()
: wxXmlResourceHandler() , m_insideBox(FALSE) : wxXmlResourceHandler() , m_insideBox(FALSE)
{ {
ADD_STYLE(wxCB_SORT); XRC_ADD_STYLE(wxCB_SORT);
AddWindowStyles(); AddWindowStyles();
} }
@@ -48,10 +48,7 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
strings[i]=strList[i]; strings[i]=strList[i];
} }
wxChoice *control = wxStaticCast(m_instance, wxChoice); XRC_MAKE_INSTANCE(control, wxChoice)
if (!control)
control = new wxChoice;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -83,16 +80,10 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
return NULL; return NULL;
} }
} }
bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node) bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
{ {
return (IsOfClass(node, wxT("wxChoice")) || return (IsOfClass(node, wxT("wxChoice")) ||
(m_insideBox && node->GetName() == wxT("item")) (m_insideBox && node->GetName() == wxT("item")));
);
} }

20
src/xrc/xh_combo.cpp
View File

@@ -27,10 +27,10 @@
wxComboBoxXmlHandler::wxComboBoxXmlHandler() wxComboBoxXmlHandler::wxComboBoxXmlHandler()
: wxXmlResourceHandler() , m_insideBox(FALSE) : wxXmlResourceHandler() , m_insideBox(FALSE)
{ {
ADD_STYLE(wxCB_SIMPLE); XRC_ADD_STYLE(wxCB_SIMPLE);
ADD_STYLE(wxCB_SORT); XRC_ADD_STYLE(wxCB_SORT);
ADD_STYLE(wxCB_READONLY); XRC_ADD_STYLE(wxCB_READONLY);
ADD_STYLE(wxCB_DROPDOWN); XRC_ADD_STYLE(wxCB_DROPDOWN);
AddWindowStyles(); AddWindowStyles();
} }
@@ -53,11 +53,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
strings[i]=strList[i]; strings[i]=strList[i];
} }
XRC_MAKE_INSTANCE(control, wxComboBox)
wxComboBox *control = wxStaticCast(m_instance, wxComboBox);
if (!control)
control = new wxComboBox;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -90,16 +86,12 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
return NULL; return NULL;
} }
} }
bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node) bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
{ {
return (IsOfClass(node, wxT("wxComboBox")) || return (IsOfClass(node, wxT("wxComboBox")) ||
(m_insideBox && node->GetName() == wxT("item")) (m_insideBox && node->GetName() == wxT("item")));
);
} }
#endif #endif

35
src/xrc/xh_dlg.cpp
View File

@@ -27,25 +27,24 @@
wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler() wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxSTAY_ON_TOP); XRC_ADD_STYLE(wxSTAY_ON_TOP);
ADD_STYLE(wxCAPTION); XRC_ADD_STYLE(wxCAPTION);
ADD_STYLE(wxDEFAULT_DIALOG_STYLE); XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
ADD_STYLE(wxTHICK_FRAME); XRC_ADD_STYLE(wxTHICK_FRAME);
ADD_STYLE(wxSYSTEM_MENU); XRC_ADD_STYLE(wxSYSTEM_MENU);
ADD_STYLE(wxRESIZE_BORDER); XRC_ADD_STYLE(wxRESIZE_BORDER);
ADD_STYLE(wxRESIZE_BOX); XRC_ADD_STYLE(wxRESIZE_BOX);
ADD_STYLE(wxDIALOG_MODAL); XRC_ADD_STYLE(wxDIALOG_MODAL);
ADD_STYLE(wxDIALOG_MODELESS); XRC_ADD_STYLE(wxDIALOG_MODELESS);
XRC_ADD_STYLE(wxNO_3D);
XRC_ADD_STYLE(wxTAB_TRAVERSAL);
XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
XRC_ADD_STYLE(wxCLIP_CHILDREN);
ADD_STYLE(wxNO_3D);
ADD_STYLE(wxTAB_TRAVERSAL);
ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
ADD_STYLE(wxCLIP_CHILDREN);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxDialogXmlHandler::DoCreateResource() wxObject *wxDialogXmlHandler::DoCreateResource()
{ {
wxDialog *dlg = wxDynamicCast(m_instance, wxDialog); wxDialog *dlg = wxDynamicCast(m_instance, wxDialog);
@@ -58,10 +57,12 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
GetStyle(wxT("style"), wxDEFAULT_DIALOG_STYLE), GetStyle(wxT("style"), wxDEFAULT_DIALOG_STYLE),
GetName()); GetName());
if (HasParam(wxT("size"))) if (HasParam(wxT("size")))
dlg->SetClientSize(GetSize()); dlg->SetClientSize(GetSize());
if (HasParam(wxT("pos"))) if (HasParam(wxT("pos")))
dlg->Move(GetPosition()); dlg->Move(GetPosition());
SetupWindow(dlg); SetupWindow(dlg);
CreateChildren(dlg); CreateChildren(dlg);
@@ -72,11 +73,7 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
return dlg; return dlg;
} }
bool wxDialogXmlHandler::CanHandle(wxXmlNode *node) bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxDialog")); return IsOfClass(node, wxT("wxDialog"));
} }

43
src/xrc/xh_frame.cpp
View File

@@ -27,30 +27,29 @@
wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler() wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxSTAY_ON_TOP); XRC_ADD_STYLE(wxSTAY_ON_TOP);
ADD_STYLE(wxCAPTION); XRC_ADD_STYLE(wxCAPTION);
ADD_STYLE(wxDEFAULT_DIALOG_STYLE); XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
ADD_STYLE(wxDEFAULT_FRAME_STYLE); XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
ADD_STYLE(wxTHICK_FRAME); XRC_ADD_STYLE(wxTHICK_FRAME);
ADD_STYLE(wxSYSTEM_MENU); XRC_ADD_STYLE(wxSYSTEM_MENU);
ADD_STYLE(wxRESIZE_BORDER); XRC_ADD_STYLE(wxRESIZE_BORDER);
ADD_STYLE(wxRESIZE_BOX); XRC_ADD_STYLE(wxRESIZE_BOX);
ADD_STYLE(wxFRAME_TOOL_WINDOW); XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
ADD_STYLE(wxFRAME_FLOAT_ON_PARENT); XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
ADD_STYLE(wxMAXIMIZE_BOX); XRC_ADD_STYLE(wxMAXIMIZE_BOX);
ADD_STYLE(wxMINIMIZE_BOX); XRC_ADD_STYLE(wxMINIMIZE_BOX);
ADD_STYLE(wxSTAY_ON_TOP); XRC_ADD_STYLE(wxSTAY_ON_TOP);
XRC_ADD_STYLE(wxNO_3D);
XRC_ADD_STYLE(wxTAB_TRAVERSAL);
XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
XRC_ADD_STYLE(wxCLIP_CHILDREN);
ADD_STYLE(wxNO_3D);
ADD_STYLE(wxTAB_TRAVERSAL);
ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
ADD_STYLE(wxCLIP_CHILDREN);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxFrameXmlHandler::DoCreateResource() wxObject *wxFrameXmlHandler::DoCreateResource()
{ {
wxFrame *frame = wxDynamicCast(m_instance, wxFrame); wxFrame *frame = wxDynamicCast(m_instance, wxFrame);
@@ -63,10 +62,12 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE), GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE),
GetName()); GetName());
if (HasParam(wxT("size"))) if (HasParam(wxT("size")))
frame->SetClientSize(GetSize()); frame->SetClientSize(GetSize());
if (HasParam(wxT("pos"))) if (HasParam(wxT("pos")))
frame->Move(GetPosition()); frame->Move(GetPosition());
SetupWindow(frame); SetupWindow(frame);
CreateChildren(frame); CreateChildren(frame);
@@ -77,11 +78,7 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
return frame; return frame;
} }
bool wxFrameXmlHandler::CanHandle(wxXmlNode *node) bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxFrame")); return IsOfClass(node, wxT("wxFrame"));
} }

16
src/xrc/xh_gauge.cpp
View File

@@ -27,19 +27,16 @@
wxGaugeXmlHandler::wxGaugeXmlHandler() wxGaugeXmlHandler::wxGaugeXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE( wxGA_HORIZONTAL ); XRC_ADD_STYLE(wxGA_HORIZONTAL);
ADD_STYLE( wxGA_VERTICAL ); XRC_ADD_STYLE(wxGA_VERTICAL);
ADD_STYLE( wxGA_PROGRESSBAR ); XRC_ADD_STYLE(wxGA_PROGRESSBAR);
ADD_STYLE( wxGA_SMOOTH ); // windows only XRC_ADD_STYLE(wxGA_SMOOTH); // windows only
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxGaugeXmlHandler::DoCreateResource() wxObject *wxGaugeXmlHandler::DoCreateResource()
{ {
wxGauge *control = wxStaticCast(m_instance, wxGauge); XRC_MAKE_INSTANCE(control, wxGauge)
if (!control)
control = new wxGauge;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -67,12 +64,9 @@ wxObject *wxGaugeXmlHandler::DoCreateResource()
return control; return control;
} }
bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node) bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxGauge")); return IsOfClass(node, wxT("wxGauge"));
} }
#endif // wxUSE_GAUGE #endif // wxUSE_GAUGE

8
src/xrc/xh_html.cpp
View File

@@ -30,14 +30,14 @@
wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler() wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxHW_SCROLLBAR_NEVER); XRC_ADD_STYLE(wxHW_SCROLLBAR_NEVER);
ADD_STYLE(wxHW_SCROLLBAR_AUTO); XRC_ADD_STYLE(wxHW_SCROLLBAR_AUTO);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxHtmlWindowXmlHandler::DoCreateResource() wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
{ {
wxHtmlWindow *control = wxStaticCast(m_instance, wxHtmlWindow); XRC_MAKE_INSTANCE(control, wxHtmlWindow)
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -75,8 +75,6 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
return control; return control;
} }
bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node) bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxHtmlWindow")); return IsOfClass(node, wxT("wxHtmlWindow"));

27
src/xrc/xh_listb.cpp
View File

@@ -25,13 +25,13 @@
wxListBoxXmlHandler::wxListBoxXmlHandler() wxListBoxXmlHandler::wxListBoxXmlHandler()
: wxXmlResourceHandler() , m_insideBox(FALSE) : wxXmlResourceHandler() , m_insideBox(FALSE)
{ {
ADD_STYLE(wxLB_SINGLE); XRC_ADD_STYLE(wxLB_SINGLE);
ADD_STYLE(wxLB_MULTIPLE); XRC_ADD_STYLE(wxLB_MULTIPLE);
ADD_STYLE(wxLB_EXTENDED); XRC_ADD_STYLE(wxLB_EXTENDED);
ADD_STYLE(wxLB_HSCROLL); XRC_ADD_STYLE(wxLB_HSCROLL);
ADD_STYLE(wxLB_ALWAYS_SB); XRC_ADD_STYLE(wxLB_ALWAYS_SB);
ADD_STYLE(wxLB_NEEDED_SB); XRC_ADD_STYLE(wxLB_NEEDED_SB);
ADD_STYLE(wxLB_SORT); XRC_ADD_STYLE(wxLB_SORT);
AddWindowStyles(); AddWindowStyles();
} }
@@ -54,10 +54,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
strings[i]=strList[i]; strings[i]=strList[i];
} }
wxListBox *control = wxStaticCast(m_instance, wxListBox); XRC_MAKE_INSTANCE(control, wxListBox)
if (!control)
control = new wxListBox;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -89,16 +86,10 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
return NULL; return NULL;
} }
} }
bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node) bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node)
{ {
return (IsOfClass(node, wxT("wxListBox")) || return (IsOfClass(node, wxT("wxListBox")) ||
(m_insideBox && node->GetName() == wxT("item")) (m_insideBox && node->GetName() == wxT("item")));
);
} }

36
src/xrc/xh_listc.cpp
View File

@@ -27,29 +27,25 @@
wxListCtrlXmlHandler::wxListCtrlXmlHandler() wxListCtrlXmlHandler::wxListCtrlXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxLC_LIST); XRC_ADD_STYLE(wxLC_LIST);
ADD_STYLE(wxLC_REPORT); XRC_ADD_STYLE(wxLC_REPORT);
ADD_STYLE(wxLC_ICON); XRC_ADD_STYLE(wxLC_ICON);
ADD_STYLE(wxLC_SMALL_ICON); XRC_ADD_STYLE(wxLC_SMALL_ICON);
ADD_STYLE(wxLC_ALIGN_TOP); XRC_ADD_STYLE(wxLC_ALIGN_TOP);
ADD_STYLE(wxLC_ALIGN_LEFT); XRC_ADD_STYLE(wxLC_ALIGN_LEFT);
ADD_STYLE(wxLC_AUTOARRANGE); XRC_ADD_STYLE(wxLC_AUTOARRANGE);
ADD_STYLE(wxLC_USER_TEXT); XRC_ADD_STYLE(wxLC_USER_TEXT);
ADD_STYLE(wxLC_EDIT_LABELS); XRC_ADD_STYLE(wxLC_EDIT_LABELS);
ADD_STYLE(wxLC_NO_HEADER); XRC_ADD_STYLE(wxLC_NO_HEADER);
ADD_STYLE(wxLC_SINGLE_SEL); XRC_ADD_STYLE(wxLC_SINGLE_SEL);
ADD_STYLE(wxLC_SORT_ASCENDING); XRC_ADD_STYLE(wxLC_SORT_ASCENDING);
ADD_STYLE(wxLC_SORT_DESCENDING); XRC_ADD_STYLE(wxLC_SORT_DESCENDING);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxListCtrlXmlHandler::DoCreateResource() wxObject *wxListCtrlXmlHandler::DoCreateResource()
{ {
wxListCtrl *list = wxStaticCast(m_instance, wxListCtrl); XRC_MAKE_INSTANCE(list, wxListCtrl)
if (!list)
list = new wxListCtrl;
list->Create(m_parentAsWindow, list->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -58,15 +54,13 @@ wxObject *wxListCtrlXmlHandler::DoCreateResource()
wxDefaultValidator, wxDefaultValidator,
GetName()); GetName());
/* TODO: columns definition */ // FIXME: add columns definition
SetupWindow(list); SetupWindow(list);
return list; return list;
} }
bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node) bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxListCtrl")); return IsOfClass(node, wxT("wxListCtrl"));

12
src/xrc/xh_menu.cpp
View File

@@ -27,11 +27,9 @@
wxMenuXmlHandler::wxMenuXmlHandler() : wxMenuXmlHandler::wxMenuXmlHandler() :
wxXmlResourceHandler(), m_insideMenu(FALSE) wxXmlResourceHandler(), m_insideMenu(FALSE)
{ {
ADD_STYLE(wxMENU_TEAROFF); XRC_ADD_STYLE(wxMENU_TEAROFF);
} }
wxObject *wxMenuXmlHandler::DoCreateResource() wxObject *wxMenuXmlHandler::DoCreateResource()
{ {
if (m_class == wxT("wxMenu")) if (m_class == wxT("wxMenu"))
@@ -103,16 +101,11 @@ bool wxMenuXmlHandler::CanHandle(wxXmlNode *node)
); );
} }
wxMenuBarXmlHandler::wxMenuBarXmlHandler() : wxXmlResourceHandler() wxMenuBarXmlHandler::wxMenuBarXmlHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxMB_DOCKABLE); XRC_ADD_STYLE(wxMB_DOCKABLE);
} }
wxObject *wxMenuBarXmlHandler::DoCreateResource() wxObject *wxMenuBarXmlHandler::DoCreateResource()
{ {
wxMenuBar *menubar = new wxMenuBar(GetStyle()); wxMenuBar *menubar = new wxMenuBar(GetStyle());
@@ -134,4 +127,3 @@ bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxMenuBar")); return IsOfClass(node, wxT("wxMenuBar"));
} }

20
src/xrc/xh_notbk.cpp
View File

@@ -30,15 +30,13 @@
wxNotebookXmlHandler::wxNotebookXmlHandler() wxNotebookXmlHandler::wxNotebookXmlHandler()
: wxXmlResourceHandler(), m_isInside(FALSE), m_notebook(NULL) : wxXmlResourceHandler(), m_isInside(FALSE), m_notebook(NULL)
{ {
ADD_STYLE(wxNB_FIXEDWIDTH); XRC_ADD_STYLE(wxNB_FIXEDWIDTH);
ADD_STYLE(wxNB_LEFT); XRC_ADD_STYLE(wxNB_LEFT);
ADD_STYLE(wxNB_RIGHT); XRC_ADD_STYLE(wxNB_RIGHT);
ADD_STYLE(wxNB_BOTTOM); XRC_ADD_STYLE(wxNB_BOTTOM);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxNotebookXmlHandler::DoCreateResource() wxObject *wxNotebookXmlHandler::DoCreateResource()
{ {
if (m_class == wxT("notebookpage")) if (m_class == wxT("notebookpage"))
@@ -70,11 +68,9 @@ wxObject *wxNotebookXmlHandler::DoCreateResource()
} }
} }
else { else
wxNotebook *nb = wxStaticCast(m_instance, wxNotebook); {
XRC_MAKE_INSTANCE(nb, wxNotebook)
if ( !nb )
nb = new wxNotebook;
nb->Create(m_parentAsWindow, nb->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -97,8 +93,6 @@ wxObject *wxNotebookXmlHandler::DoCreateResource()
} }
} }
bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node) bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node)
{ {
return ((!m_isInside && IsOfClass(node, wxT("wxNotebook"))) || return ((!m_isInside && IsOfClass(node, wxT("wxNotebook"))) ||

16
src/xrc/xh_panel.cpp
View File

@@ -25,21 +25,16 @@
wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler() wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxNO_3D); XRC_ADD_STYLE(wxNO_3D);
ADD_STYLE(wxTAB_TRAVERSAL); XRC_ADD_STYLE(wxTAB_TRAVERSAL);
ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY); XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
ADD_STYLE(wxCLIP_CHILDREN); XRC_ADD_STYLE(wxCLIP_CHILDREN);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxPanelXmlHandler::DoCreateResource() wxObject *wxPanelXmlHandler::DoCreateResource()
{ {
wxPanel *panel = wxDynamicCast(m_instance, wxPanel); XRC_MAKE_INSTANCE(panel, wxPanel)
if (!panel)
panel = new wxPanel;
panel->Create(m_parentAsWindow, panel->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -53,7 +48,6 @@ wxObject *wxPanelXmlHandler::DoCreateResource()
return panel; return panel;
} }
bool wxPanelXmlHandler::CanHandle(wxXmlNode *node) bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxPanel")); return IsOfClass(node, wxT("wxPanel"));

10
src/xrc/xh_radbt.cpp
View File

@@ -27,7 +27,7 @@
wxRadioButtonXmlHandler::wxRadioButtonXmlHandler() wxRadioButtonXmlHandler::wxRadioButtonXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE( wxRB_GROUP ); XRC_ADD_STYLE(wxRB_GROUP);
AddWindowStyles(); AddWindowStyles();
} }
@@ -40,10 +40,7 @@ wxObject *wxRadioButtonXmlHandler::DoCreateResource()
* normal radio button. * normal radio button.
*/ */
wxRadioButton *control = wxStaticCast(m_instance, wxRadioButton); XRC_MAKE_INSTANCE(control, wxRadioButton)
if (!control)
control = new wxRadioButton;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -59,12 +56,9 @@ wxObject *wxRadioButtonXmlHandler::DoCreateResource()
return control; return control;
} }
bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node) bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxRadioButton")); return IsOfClass(node, wxT("wxRadioButton"));
} }
#endif #endif

18
src/xrc/xh_radbx.cpp
View File

@@ -27,10 +27,10 @@
wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() wxRadioBoxXmlHandler::wxRadioBoxXmlHandler()
: wxXmlResourceHandler(), m_insideBox(FALSE) : wxXmlResourceHandler(), m_insideBox(FALSE)
{ {
ADD_STYLE(wxRA_SPECIFY_COLS); XRC_ADD_STYLE(wxRA_SPECIFY_COLS);
ADD_STYLE(wxRA_HORIZONTAL); XRC_ADD_STYLE(wxRA_HORIZONTAL);
ADD_STYLE(wxRA_SPECIFY_ROWS); XRC_ADD_STYLE(wxRA_SPECIFY_ROWS);
ADD_STYLE(wxRA_VERTICAL); XRC_ADD_STYLE(wxRA_VERTICAL);
AddWindowStyles(); AddWindowStyles();
} }
@@ -53,10 +53,7 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
strings[i]=strList[i]; strings[i]=strList[i];
} }
wxRadioBox *control = wxStaticCast(m_instance, wxRadioBox); XRC_MAKE_INSTANCE(control, wxRadioBox)
if (!control)
control = new wxRadioBox;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -93,13 +90,10 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
} }
bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node) bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node)
{ {
return (IsOfClass(node, wxT("wxRadioBox")) || return (IsOfClass(node, wxT("wxRadioBox")) ||
(m_insideBox && node->GetName() == wxT("item")) (m_insideBox && node->GetName() == wxT("item")));
);
} }
#endif #endif

18
src/xrc/xh_scrol.cpp
View File

@@ -26,17 +26,14 @@
wxScrollBarXmlHandler::wxScrollBarXmlHandler() wxScrollBarXmlHandler::wxScrollBarXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE( wxSB_HORIZONTAL ); XRC_ADD_STYLE(wxSB_HORIZONTAL);
ADD_STYLE( wxSB_VERTICAL ); XRC_ADD_STYLE(wxSB_VERTICAL);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxScrollBarXmlHandler::DoCreateResource() wxObject *wxScrollBarXmlHandler::DoCreateResource()
{ {
wxScrollBar *control = wxStaticCast(m_instance, wxScrollBar); XRC_MAKE_INSTANCE(control, wxScrollBar)
if (!control)
control = new wxScrollBar;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -48,21 +45,14 @@ wxObject *wxScrollBarXmlHandler::DoCreateResource()
control->SetScrollbar(GetLong( wxT("value"), 0), control->SetScrollbar(GetLong( wxT("value"), 0),
GetLong( wxT("thumbsize"),1), GetLong( wxT("thumbsize"),1),
GetLong( wxT("range"), 10), GetLong( wxT("range"), 10),
GetLong( wxT("pagesize"),1) GetLong( wxT("pagesize"),1));
);
SetupWindow(control); SetupWindow(control);
return control; return control;
} }
bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node) bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxScrollBar")); return IsOfClass(node, wxT("wxScrollBar"));
} }

50
src/xrc/xh_sizer.cpp
View File

@@ -39,35 +39,35 @@ bool wxSizerXmlHandler::IsSizerNode(wxXmlNode *node)
wxSizerXmlHandler::wxSizerXmlHandler() wxSizerXmlHandler::wxSizerXmlHandler()
: wxXmlResourceHandler(), m_isInside(FALSE), m_parentSizer(NULL) : wxXmlResourceHandler(), m_isInside(FALSE), m_parentSizer(NULL)
{ {
ADD_STYLE(wxHORIZONTAL); XRC_ADD_STYLE(wxHORIZONTAL);
ADD_STYLE(wxVERTICAL); XRC_ADD_STYLE(wxVERTICAL);
// and flags // and flags
ADD_STYLE(wxLEFT); XRC_ADD_STYLE(wxLEFT);
ADD_STYLE(wxRIGHT); XRC_ADD_STYLE(wxRIGHT);
ADD_STYLE(wxTOP); XRC_ADD_STYLE(wxTOP);
ADD_STYLE(wxBOTTOM); XRC_ADD_STYLE(wxBOTTOM);
ADD_STYLE(wxNORTH); XRC_ADD_STYLE(wxNORTH);
ADD_STYLE(wxSOUTH); XRC_ADD_STYLE(wxSOUTH);
ADD_STYLE(wxEAST); XRC_ADD_STYLE(wxEAST);
ADD_STYLE(wxWEST); XRC_ADD_STYLE(wxWEST);
ADD_STYLE(wxALL); XRC_ADD_STYLE(wxALL);
ADD_STYLE(wxGROW); XRC_ADD_STYLE(wxGROW);
ADD_STYLE(wxEXPAND); XRC_ADD_STYLE(wxEXPAND);
ADD_STYLE(wxSHAPED); XRC_ADD_STYLE(wxSHAPED);
ADD_STYLE(wxSTRETCH_NOT); XRC_ADD_STYLE(wxSTRETCH_NOT);
ADD_STYLE(wxALIGN_CENTER); XRC_ADD_STYLE(wxALIGN_CENTER);
ADD_STYLE(wxALIGN_CENTRE); XRC_ADD_STYLE(wxALIGN_CENTRE);
ADD_STYLE(wxALIGN_LEFT); XRC_ADD_STYLE(wxALIGN_LEFT);
ADD_STYLE(wxALIGN_TOP); XRC_ADD_STYLE(wxALIGN_TOP);
ADD_STYLE(wxALIGN_RIGHT); XRC_ADD_STYLE(wxALIGN_RIGHT);
ADD_STYLE(wxALIGN_BOTTOM); XRC_ADD_STYLE(wxALIGN_BOTTOM);
ADD_STYLE(wxALIGN_CENTER_HORIZONTAL); XRC_ADD_STYLE(wxALIGN_CENTER_HORIZONTAL);
ADD_STYLE(wxALIGN_CENTRE_HORIZONTAL); XRC_ADD_STYLE(wxALIGN_CENTRE_HORIZONTAL);
ADD_STYLE(wxALIGN_CENTER_VERTICAL); XRC_ADD_STYLE(wxALIGN_CENTER_VERTICAL);
ADD_STYLE(wxALIGN_CENTRE_VERTICAL); XRC_ADD_STYLE(wxALIGN_CENTRE_VERTICAL);
} }

28
src/xrc/xh_slidr.cpp
View File

@@ -27,25 +27,22 @@
wxSliderXmlHandler::wxSliderXmlHandler() wxSliderXmlHandler::wxSliderXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE( wxSL_HORIZONTAL ); XRC_ADD_STYLE(wxSL_HORIZONTAL);
ADD_STYLE( wxSL_VERTICAL ); XRC_ADD_STYLE(wxSL_VERTICAL);
ADD_STYLE( wxSL_AUTOTICKS ); XRC_ADD_STYLE(wxSL_AUTOTICKS);
ADD_STYLE( wxSL_LABELS ); XRC_ADD_STYLE(wxSL_LABELS);
ADD_STYLE( wxSL_LEFT ); XRC_ADD_STYLE(wxSL_LEFT);
ADD_STYLE( wxSL_TOP ); XRC_ADD_STYLE(wxSL_TOP);
ADD_STYLE( wxSL_RIGHT ); XRC_ADD_STYLE(wxSL_RIGHT);
ADD_STYLE( wxSL_BOTTOM ); XRC_ADD_STYLE(wxSL_BOTTOM);
ADD_STYLE( wxSL_BOTH ); XRC_ADD_STYLE(wxSL_BOTH);
ADD_STYLE( wxSL_SELRANGE ); XRC_ADD_STYLE(wxSL_SELRANGE);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxSliderXmlHandler::DoCreateResource() wxObject *wxSliderXmlHandler::DoCreateResource()
{ {
wxSlider *control = wxStaticCast(m_instance, wxSlider); XRC_MAKE_INSTANCE(control, wxSlider)
if (!control)
control = new wxSlider;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -87,12 +84,9 @@ wxObject *wxSliderXmlHandler::DoCreateResource()
return control; return control;
} }
bool wxSliderXmlHandler::CanHandle(wxXmlNode *node) bool wxSliderXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxSlider")); return IsOfClass(node, wxT("wxSlider"));
} }
#endif #endif

32
src/xrc/xh_spin.cpp
View File

@@ -27,19 +27,16 @@
wxSpinButtonXmlHandler::wxSpinButtonXmlHandler() wxSpinButtonXmlHandler::wxSpinButtonXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE( wxSP_HORIZONTAL ); XRC_ADD_STYLE(wxSP_HORIZONTAL);
ADD_STYLE( wxSP_VERTICAL ); XRC_ADD_STYLE(wxSP_VERTICAL);
ADD_STYLE( wxSP_ARROW_KEYS ); XRC_ADD_STYLE(wxSP_ARROW_KEYS);
ADD_STYLE( wxSP_WRAP ); XRC_ADD_STYLE(wxSP_WRAP);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxSpinButtonXmlHandler::DoCreateResource() wxObject *wxSpinButtonXmlHandler::DoCreateResource()
{ {
wxSpinButton *control = wxStaticCast(m_instance, wxSpinButton); XRC_MAKE_INSTANCE(control, wxSpinButton)
if (!control)
control = new wxSpinButton;
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -55,8 +52,6 @@ wxObject *wxSpinButtonXmlHandler::DoCreateResource()
return control; return control;
} }
bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node) bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxSpinButton")); return IsOfClass(node, wxT("wxSpinButton"));
@@ -69,15 +64,17 @@ bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE( wxSP_HORIZONTAL ); XRC_ADD_STYLE(wxSP_HORIZONTAL);
ADD_STYLE( wxSP_VERTICAL ); XRC_ADD_STYLE(wxSP_VERTICAL);
ADD_STYLE( wxSP_ARROW_KEYS ); XRC_ADD_STYLE(wxSP_ARROW_KEYS);
ADD_STYLE( wxSP_WRAP ); XRC_ADD_STYLE(wxSP_WRAP);
} }
wxObject *wxSpinCtrlXmlHandler::DoCreateResource() wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
{ {
wxSpinCtrl *control = new wxSpinCtrl(m_parentAsWindow, XRC_MAKE_INSTANCE(control, wxSpinCtrl)
control->Create(m_parentAsWindow,
GetID(), GetID(),
GetText(wxT("value")), GetText(wxT("value")),
GetPosition(), GetSize(), GetPosition(), GetSize(),
@@ -85,16 +82,13 @@ wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
GetLong(wxT("min"), wxSP_DEFAULT_MIN), GetLong(wxT("min"), wxSP_DEFAULT_MIN),
GetLong(wxT("max"), wxSP_DEFAULT_MAX), GetLong(wxT("max"), wxSP_DEFAULT_MAX),
GetLong(wxT("value"), wxSP_DEFAULT_VALUE), GetLong(wxT("value"), wxSP_DEFAULT_VALUE),
GetName() GetName());
);
SetupWindow(control); SetupWindow(control);
return control; return control;
} }
bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node) bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxSpinCtrl")); return IsOfClass(node, wxT("wxSpinCtrl"));

9
src/xrc/xh_stbmp.cpp
View File

@@ -30,10 +30,7 @@ wxStaticBitmapXmlHandler::wxStaticBitmapXmlHandler()
wxObject *wxStaticBitmapXmlHandler::DoCreateResource() wxObject *wxStaticBitmapXmlHandler::DoCreateResource()
{ {
wxStaticBitmap *bmp = wxStaticCast(m_instance, wxStaticBitmap); XRC_MAKE_INSTANCE(bmp, wxStaticBitmap)
if (!bmp)
bmp = new wxStaticBitmap;
bmp->Create(m_parentAsWindow, bmp->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -47,11 +44,7 @@ wxObject *wxStaticBitmapXmlHandler::DoCreateResource()
return bmp; return bmp;
} }
bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node) bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxStaticBitmap")); return IsOfClass(node, wxT("wxStaticBitmap"));
} }

9
src/xrc/xh_stbox.cpp
View File

@@ -30,10 +30,7 @@ wxStaticBoxXmlHandler::wxStaticBoxXmlHandler()
wxObject *wxStaticBoxXmlHandler::DoCreateResource() wxObject *wxStaticBoxXmlHandler::DoCreateResource()
{ {
wxStaticBox *box = wxStaticCast(m_instance, wxStaticBox); XRC_MAKE_INSTANCE(box, wxStaticBox)
if (!box)
box = new wxStaticBox;
box->Create(m_parentAsWindow, box->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -47,11 +44,7 @@ wxObject *wxStaticBoxXmlHandler::DoCreateResource()
return box; return box;
} }
bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node) bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxStaticBox")); return IsOfClass(node, wxT("wxStaticBox"));
} }

11
src/xrc/xh_stlin.cpp
View File

@@ -27,17 +27,14 @@
wxStaticLineXmlHandler::wxStaticLineXmlHandler() wxStaticLineXmlHandler::wxStaticLineXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxLI_HORIZONTAL); XRC_ADD_STYLE(wxLI_HORIZONTAL);
ADD_STYLE(wxLI_VERTICAL); XRC_ADD_STYLE(wxLI_VERTICAL);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxStaticLineXmlHandler::DoCreateResource() wxObject *wxStaticLineXmlHandler::DoCreateResource()
{ {
wxStaticLine *line = wxStaticCast(m_instance, wxStaticLine); XRC_MAKE_INSTANCE(line, wxStaticLine)
if (!line)
line = new wxStaticLine;
line->Create(m_parentAsWindow, line->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -50,8 +47,6 @@ wxObject *wxStaticLineXmlHandler::DoCreateResource()
return line; return line;
} }
bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node) bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxStaticLine")); return IsOfClass(node, wxT("wxStaticLine"));

17
src/xrc/xh_sttxt.cpp
View File

@@ -25,19 +25,16 @@
wxStaticTextXmlHandler::wxStaticTextXmlHandler() wxStaticTextXmlHandler::wxStaticTextXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxST_NO_AUTORESIZE); XRC_ADD_STYLE(wxST_NO_AUTORESIZE);
ADD_STYLE(wxALIGN_LEFT); XRC_ADD_STYLE(wxALIGN_LEFT);
ADD_STYLE(wxALIGN_RIGHT); XRC_ADD_STYLE(wxALIGN_RIGHT);
ADD_STYLE(wxALIGN_CENTRE); XRC_ADD_STYLE(wxALIGN_CENTRE);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxStaticTextXmlHandler::DoCreateResource() wxObject *wxStaticTextXmlHandler::DoCreateResource()
{ {
wxStaticText *text = wxStaticCast(m_instance, wxStaticText); XRC_MAKE_INSTANCE(text, wxStaticText)
if (!text)
text = new wxStaticText;
text->Create(m_parentAsWindow, text->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -51,11 +48,7 @@ wxObject *wxStaticTextXmlHandler::DoCreateResource()
return text; return text;
} }
bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node) bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxStaticText")); return IsOfClass(node, wxT("wxStaticText"));
} }

21
src/xrc/xh_text.cpp
View File

@@ -24,21 +24,18 @@
wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler() wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxTE_PROCESS_ENTER); XRC_ADD_STYLE(wxTE_PROCESS_ENTER);
ADD_STYLE(wxTE_PROCESS_TAB); XRC_ADD_STYLE(wxTE_PROCESS_TAB);
ADD_STYLE(wxTE_MULTILINE); XRC_ADD_STYLE(wxTE_MULTILINE);
ADD_STYLE(wxTE_PASSWORD); XRC_ADD_STYLE(wxTE_PASSWORD);
ADD_STYLE(wxTE_READONLY); XRC_ADD_STYLE(wxTE_READONLY);
ADD_STYLE(wxHSCROLL); XRC_ADD_STYLE(wxHSCROLL);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxTextCtrlXmlHandler::DoCreateResource() wxObject *wxTextCtrlXmlHandler::DoCreateResource()
{ {
wxTextCtrl *text = wxStaticCast(m_instance, wxTextCtrl); XRC_MAKE_INSTANCE(text, wxTextCtrl)
if ( !text )
text = new wxTextCtrl;
text->Create(m_parentAsWindow, text->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -53,11 +50,7 @@ wxObject *wxTextCtrlXmlHandler::DoCreateResource()
return text; return text;
} }
bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node) bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxTextCtrl")); return IsOfClass(node, wxT("wxTextCtrl"));
} }

17
src/xrc/xh_toolb.cpp
View File

@@ -28,14 +28,12 @@
wxToolBarXmlHandler::wxToolBarXmlHandler() wxToolBarXmlHandler::wxToolBarXmlHandler()
: wxXmlResourceHandler(), m_isInside(FALSE), m_toolbar(NULL) : wxXmlResourceHandler(), m_isInside(FALSE), m_toolbar(NULL)
{ {
ADD_STYLE(wxTB_FLAT); XRC_ADD_STYLE(wxTB_FLAT);
ADD_STYLE(wxTB_DOCKABLE); XRC_ADD_STYLE(wxTB_DOCKABLE);
ADD_STYLE(wxTB_VERTICAL); XRC_ADD_STYLE(wxTB_VERTICAL);
ADD_STYLE(wxTB_HORIZONTAL); XRC_ADD_STYLE(wxTB_HORIZONTAL);
} }
wxObject *wxToolBarXmlHandler::DoCreateResource() wxObject *wxToolBarXmlHandler::DoCreateResource()
{ {
if (m_class == wxT("tool")) if (m_class == wxT("tool"))
@@ -67,10 +65,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
if (!(style & wxNO_BORDER)) style |= wxNO_BORDER; if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
#endif #endif
wxToolBar *toolbar = wxStaticCast(m_instance, wxToolBar); XRC_MAKE_INSTANCE(toolbar, wxToolBar)
if ( !toolbar )
toolbar = new wxToolBar;
toolbar->Create(m_parentAsWindow, toolbar->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -135,8 +130,6 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
} }
} }
bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node) bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node)
{ {
return ((!m_isInside && IsOfClass(node, wxT("wxToolBar"))) || return ((!m_isInside && IsOfClass(node, wxT("wxToolBar"))) ||

16
src/xrc/xh_tree.cpp
View File

@@ -26,19 +26,15 @@
wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler() wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
ADD_STYLE(wxTR_HAS_BUTTONS); XRC_ADD_STYLE(wxTR_HAS_BUTTONS);
ADD_STYLE(wxTR_EDIT_LABELS); XRC_ADD_STYLE(wxTR_EDIT_LABELS);
ADD_STYLE(wxTR_MULTIPLE); XRC_ADD_STYLE(wxTR_MULTIPLE);
AddWindowStyles(); AddWindowStyles();
} }
wxObject *wxTreeCtrlXmlHandler::DoCreateResource() wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
{ {
wxTreeCtrl *tree = wxStaticCast(m_instance, wxTreeCtrl); XRC_MAKE_INSTANCE(tree, wxTreeCtrl)
if (!tree)
tree = new wxTreeCtrl;
tree->Create(m_parentAsWindow, tree->Create(m_parentAsWindow,
GetID(), GetID(),
@@ -52,11 +48,7 @@ wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
return tree; return tree;
} }
bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node) bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node)
{ {
return IsOfClass(node, wxT("wxTreeCtrl")); return IsOfClass(node, wxT("wxTreeCtrl"));
} }